Merge branch 'master' into smb-workgroup

225 files changed, 5339 insertions, 5415 deletions

diff --git a/apps/files_external/ajax/dropbox.php b/apps/files_external/ajax/oauth1.php
index 55dc417b73a..ca339aeec58 100644
--- a/apps/files_external/ajax/dropbox.php
+++ b/apps/files_external/ajax/oauth1.php
@@ -30,6 +30,7 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();
 $l = \OC::$server->getL10N('files_external');
 
+// FIXME: currently hard-coded to Dropbox OAuth
 if (isset($_POST['app_key']) && isset($_POST['app_secret'])) {
 	$oauth = new Dropbox_OAuth_Curl((string)$_POST['app_key'], (string)$_POST['app_secret']);
 	if (isset($_POST['step'])) {
@@ -47,7 +48,7 @@ if (isset($_POST['app_key']) && isset($_POST['app_secret'])) {
 															'request_token_secret' => $token['token_secret'])));
 				} catch (Exception $exception) {
 					OCP\JSON::error(array('data' => array('message' =>
-						$l->t('Fetching request tokens failed. Verify that your Dropbox app key and secret are correct.'))
+						$l->t('Fetching request tokens failed. Verify that your app key and secret are correct.'))
 						));
 				}
 				break;
@@ -60,7 +61,7 @@ if (isset($_POST['app_key']) && isset($_POST['app_secret'])) {
 												'access_token_secret' => $token['token_secret']));
 					} catch (Exception $exception) {
 						OCP\JSON::error(array('data' => array('message' =>
-							$l->t('Fetching access tokens failed. Verify that your Dropbox app key and secret are correct.'))
+							$l->t('Fetching access tokens failed. Verify that your app key and secret are correct.'))
 							));
 					}
 				}
@@ -68,5 +69,5 @@ if (isset($_POST['app_key']) && isset($_POST['app_secret'])) {
 		}
 	}
 } else {
-	OCP\JSON::error(array('data' => array('message' => $l->t('Please provide a valid Dropbox app key and secret.'))));
+	OCP\JSON::error(array('data' => array('message' => $l->t('Please provide a valid app key and secret.'))));
 }
diff --git a/apps/files_external/ajax/google.php b/apps/files_external/ajax/oauth2.php
index acaf1b0b27f..0a202e3ddcb 100644
--- a/apps/files_external/ajax/google.php
+++ b/apps/files_external/ajax/oauth2.php
@@ -33,6 +33,7 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();
 $l = \OC::$server->getL10N('files_external');
 
+// FIXME: currently hard-coded to Google Drive
 if (isset($_POST['client_id']) && isset($_POST['client_secret']) && isset($_POST['redirect'])) {
 	$client = new Google_Client();
 	$client->setClientId((string)$_POST['client_id']);
diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php
index 3d8e610db4d..f33012b5f09 100644
--- a/apps/files_external/appinfo/app.php
+++ b/apps/files_external/appinfo/app.php
@@ -37,11 +37,9 @@ OC::$CLASSPATH['OC\Files\Storage\OwnCloud'] = 'files_external/lib/owncloud.php';
 OC::$CLASSPATH['OC\Files\Storage\Google'] = 'files_external/lib/google.php';
 OC::$CLASSPATH['OC\Files\Storage\Swift'] = 'files_external/lib/swift.php';
 OC::$CLASSPATH['OC\Files\Storage\SMB'] = 'files_external/lib/smb.php';
-OC::$CLASSPATH['OC\Files\Storage\SMB_OC'] = 'files_external/lib/smb_oc.php';
 OC::$CLASSPATH['OC\Files\Storage\AmazonS3'] = 'files_external/lib/amazons3.php';
 OC::$CLASSPATH['OC\Files\Storage\Dropbox'] = 'files_external/lib/dropbox.php';
 OC::$CLASSPATH['OC\Files\Storage\SFTP'] = 'files_external/lib/sftp.php';
-OC::$CLASSPATH['OC\Files\Storage\SFTP_Key'] = 'files_external/lib/sftp_key.php';
 OC::$CLASSPATH['OC_Mount_Config'] = 'files_external/lib/config.php';
 OC::$CLASSPATH['OCA\Files\External\Api'] = 'files_external/lib/api.php';
 
@@ -68,106 +66,6 @@ if (OCP\Config::getAppValue('files_external', 'allow_user_mounting', 'yes') == '
 
 // connecting hooks
 OCP\Util::connectHook('OC_Filesystem', 'post_initMountPoints', '\OC_Mount_Config', 'initMountPointsHook');
-OCP\Util::connectHook('OC_User', 'post_login', 'OC\Files\Storage\SMB_OC', 'login');
 
-OC_Mount_Config::registerBackend('\OC\Files\Storage\AmazonS3', [
-	'backend' => (string)$l->t('Amazon S3'),
-	'priority' => 100,
-	'configuration' => [
-		'key' => (string)$l->t('Key'),
-		'secret' => '*'.$l->t('Secret'),
-		'bucket' => (string)$l->t('Bucket'),
-	],
-	'has_dependencies' => true,
-]);
-
-OC_Mount_Config::registerBackend('\OC\Files\Storage\AmazonS3', [
-	'backend' => (string)$l->t('Amazon S3 and compliant'),
-	'priority' => 100,
-	'configuration' => [
-		'key' => (string)$l->t('Access Key'),
-		'secret' => '*'.$l->t('Secret Key'),
-		'bucket' => (string)$l->t('Bucket'),
-		'hostname' => '&'.$l->t('Hostname'),
-		'port' => '&'.$l->t('Port'),
-		'region' => '&'.$l->t('Region'),
-		'use_ssl' => '!'.$l->t('Enable SSL'),
-		'use_path_style' => '!'.$l->t('Enable Path Style')
-	],
-	'has_dependencies' => true,
-]);
-
-OC_Mount_Config::registerBackend('\OC\Files\Storage\Dropbox', [
-	'backend' => 'Dropbox',
-	'priority' => 100,
-	'configuration' => [
-		'configured' => '#configured',
-		'app_key' => (string)$l->t('App key'),
-		'app_secret' => '*'.$l->t('App secret'),
-		'token' => '#token',
-		'token_secret' => '#token_secret'
-	],
-	'custom' => 'dropbox',
-	'has_dependencies' => true,
-]);
-
-OC_Mount_Config::registerBackend('\OC\Files\Storage\Google', [
-	'backend' => 'Google Drive',
-	'priority' => 100,
-	'configuration' => [
-		'configured' => '#configured',
-		'client_id' => (string)$l->t('Client ID'),
-		'client_secret' => '*'.$l->t('Client secret'),
-		'token' => '#token',
-	],
-	'custom' => 'google',
-	'has_dependencies' => true,
-]);
-
-
-OC_Mount_Config::registerBackend('\OC\Files\Storage\Swift', [
-	'backend' => (string)$l->t('OpenStack Object Storage'),
-	'priority' => 100,
-	'configuration' => [
-		'user' => (string)$l->t('Username'),
-		'bucket' => (string)$l->t('Bucket'),
-		'region' => '&'.$l->t('Region (optional for OpenStack Object Storage)'),
-		'key' => '&*'.$l->t('API Key (required for Rackspace Cloud Files)'),
-		'tenant' => '&'.$l->t('Tenantname (required for OpenStack Object Storage)'),
-		'password' => '&*'.$l->t('Password (required for OpenStack Object Storage)'),
-		'service_name' => '&'.$l->t('Service Name (required for OpenStack Object Storage)'),
-		'url' => '&'.$l->t('URL of identity endpoint (required for OpenStack Object Storage)'),
-		'timeout' => '&'.$l->t('Timeout of HTTP requests in seconds'),
-	],
-	'has_dependencies' => true,
-]);
-
-
-if (!OC_Util::runningOnWindows()) {
-	OC_Mount_Config::registerBackend('\OC\Files\Storage\SMB_OC', [
-			'backend' => (string)$l->t('SMB / CIFS using OC login'),
-			'priority' => 90,
-			'configuration' => [
-				'host' => (string)$l->t('Host'),
-				'username_as_share' => '!'.$l->t('Username as share'),
-				'share' => '&'.$l->t('Share'),
-				'root' => '&'.$l->t('Remote subfolder'),
-			],
-		'has_dependencies' => true,
-	]);
-}
-
-OC_Mount_Config::registerBackend('\OC\Files\Storage\SFTP_Key', [
-	'backend' => (string)$l->t('SFTP with secret key login'),
-	'priority' => 100,
-	'configuration' => array(
-		'host' => (string)$l->t('Host'),
-		'user' => (string)$l->t('Username'),
-		'public_key' => (string)$l->t('Public key'),
-		'private_key' => '#private_key',
-		'root' => '&'.$l->t('Remote subfolder')),
-	'custom' => 'sftp_key',
-	]
-);
 $mountProvider = $appContainer->query('OCA\Files_External\Config\ConfigAdapter');
 \OC::$server->getMountProviderCollection()->registerProvider($mountProvider);
diff --git a/apps/files_external/appinfo/application.php b/apps/files_external/appinfo/application.php
index 4520a8737be..3a222141fb5 100644
--- a/apps/files_external/appinfo/application.php
+++ b/apps/files_external/appinfo/application.php
@@ -24,7 +24,6 @@
 
 namespace OCA\Files_External\AppInfo;
 
-use \OCA\Files_External\Controller\AjaxController;
 use \OCP\AppFramework\App;
 use \OCP\IContainer;
 use \OCA\Files_External\Service\BackendService;
@@ -36,20 +35,13 @@ class Application extends App {
 	public function __construct(array $urlParams=array()) {
 		parent::__construct('files_external', $urlParams);
 
-		$container = $this->getContainer();
-
-		/**
-		 * Controllers
-		 */
-		$container->registerService('AjaxController', function (IContainer $c) {
-			return new AjaxController(
-				$c->query('AppName'),
-				$c->query('Request')
-			);
-		});
-
 		$this->loadBackends();
 		$this->loadAuthMechanisms();
+
+		// app developers: do NOT depend on this! it will disappear with oC 9.0!
+		\OC::$server->getEventDispatcher()->dispatch(
+			'OCA\\Files_External::loadAdditionalBackends'
+		);
 	}
 
 	/**
@@ -65,11 +57,17 @@ class Application extends App {
 			$container->query('OCA\Files_External\Lib\Backend\DAV'),
 			$container->query('OCA\Files_External\Lib\Backend\OwnCloud'),
 			$container->query('OCA\Files_External\Lib\Backend\SFTP'),
+			$container->query('OCA\Files_External\Lib\Backend\AmazonS3'),
+			$container->query('OCA\Files_External\Lib\Backend\Dropbox'),
+			$container->query('OCA\Files_External\Lib\Backend\Google'),
+			$container->query('OCA\Files_External\Lib\Backend\Swift'),
+			$container->query('OCA\Files_External\Lib\Backend\SFTP_Key'),
 		]);
 
 		if (!\OC_Util::runningOnWindows()) {
 			$service->registerBackends([
 				$container->query('OCA\Files_External\Lib\Backend\SMB'),
+				$container->query('OCA\Files_External\Lib\Backend\SMB_OC'),
 			]);
 		}
 	}
@@ -91,6 +89,22 @@ class Application extends App {
 			// AuthMechanism::SCHEME_PASSWORD mechanisms
 			$container->query('OCA\Files_External\Lib\Auth\Password\Password'),
 			$container->query('OCA\Files_External\Lib\Auth\Password\SessionCredentials'),
+
+			// AuthMechanism::SCHEME_OAUTH1 mechanisms
+			$container->query('OCA\Files_External\Lib\Auth\OAuth1\OAuth1'),
+
+			// AuthMechanism::SCHEME_OAUTH2 mechanisms
+			$container->query('OCA\Files_External\Lib\Auth\OAuth2\OAuth2'),
+
+			// AuthMechanism::SCHEME_PUBLICKEY mechanisms
+			$container->query('OCA\Files_External\Lib\Auth\PublicKey\RSA'),
+
+			// AuthMechanism::SCHEME_OPENSTACK mechanisms
+			$container->query('OCA\Files_External\Lib\Auth\OpenStack\OpenStack'),
+			$container->query('OCA\Files_External\Lib\Auth\OpenStack\Rackspace'),
+
+			// Specialized mechanisms
+			$container->query('OCA\Files_External\Lib\Auth\AmazonS3\AccessKey'),
 		]);
 	}
 
diff --git a/apps/files_external/appinfo/routes.php b/apps/files_external/appinfo/routes.php
index 4462ad1f274..a371273e74e 100644
--- a/apps/files_external/appinfo/routes.php
+++ b/apps/files_external/appinfo/routes.php
@@ -38,7 +38,7 @@ namespace OCA\Files_External\AppInfo;
 		'routes' => array(
 			array(
 				'name' => 'Ajax#getSshKeys',
-				'url' => '/ajax/sftp_key.php',
+				'url' => '/ajax/public_key.php',
 				'verb' => 'POST',
 				'requirements' => array()
 			)
@@ -46,10 +46,10 @@ namespace OCA\Files_External\AppInfo;
 	)
 );
 
-$this->create('files_external_dropbox', 'ajax/dropbox.php')
-	->actionInclude('files_external/ajax/dropbox.php');
-$this->create('files_external_google', 'ajax/google.php')
-	->actionInclude('files_external/ajax/google.php');
+$this->create('files_external_oauth1', 'ajax/oauth1.php')
+	->actionInclude('files_external/ajax/oauth1.php');
+$this->create('files_external_oauth2', 'ajax/oauth2.php')
+	->actionInclude('files_external/ajax/oauth2.php');
 
 
 $this->create('files_external_list_applicable', '/applicable')
diff --git a/apps/files_external/controller/ajaxcontroller.php b/apps/files_external/controller/ajaxcontroller.php
index cb2de432286..c285cd34e70 100644
--- a/apps/files_external/controller/ajaxcontroller.php
+++ b/apps/files_external/controller/ajaxcontroller.php
@@ -25,19 +25,19 @@ namespace OCA\Files_External\Controller;
 use OCP\AppFramework\Controller;
 use OCP\IRequest;
 use OCP\AppFramework\Http\JSONResponse;
-use phpseclib\Crypt\RSA;
+use OCA\Files_External\Lib\Auth\PublicKey\RSA;
 
 class AjaxController extends Controller {
-	public function __construct($appName, IRequest $request) {
+	/** @var RSA */
+	private $rsaMechanism;
+
+	public function __construct($appName, IRequest $request, RSA $rsaMechanism) {
 		parent::__construct($appName, $request);
+		$this->rsaMechanism = $rsaMechanism;
 	}
 
 	private function generateSshKeys() {
-		$rsa = new RSA();
-		$rsa->setPublicKeyFormat(RSA::PUBLIC_FORMAT_OPENSSH);
-		$rsa->setPassword(\OC::$server->getConfig()->getSystemValue('secret', ''));
-
-		$key = $rsa->createKey();
+		$key = $this->rsaMechanism->createKey();
 		// Replace the placeholder label with a more meaningful one
 		$key['publicKey'] = str_replace('phpseclib-generated-key', gethostname(), $key['publickey']);
 
diff --git a/apps/files_external/controller/globalstoragescontroller.php b/apps/files_external/controller/globalstoragescontroller.php
index 756a34fc5d4..7d97fdbb4f4 100644
--- a/apps/files_external/controller/globalstoragescontroller.php
+++ b/apps/files_external/controller/globalstoragescontroller.php
@@ -32,6 +32,7 @@ use \OCP\AppFramework\Http;
 use \OCA\Files_external\Service\GlobalStoragesService;
 use \OCA\Files_external\NotFoundException;
 use \OCA\Files_external\Lib\StorageConfig;
+use \OCA\Files_External\Service\BackendService;
 
 /**
  * Global storages controller
@@ -97,7 +98,7 @@ class GlobalStoragesController extends StoragesController {
 			return $newStorage;
 		}
 
-		$response = $this->validate($newStorage);
+		$response = $this->validate($newStorage, BackendService::PERMISSION_CREATE);
 		if (!empty($response)) {
 			return $response;
 		}
@@ -153,7 +154,7 @@ class GlobalStoragesController extends StoragesController {
 		}
 		$storage->setId($id);
 
-		$response = $this->validate($storage);
+		$response = $this->validate($storage, BackendService::PERMISSION_MODIFY);
 		if (!empty($response)) {
 			return $response;
 		}
@@ -178,4 +179,14 @@ class GlobalStoragesController extends StoragesController {
 
 	}
 
+	/**
+	 * Get the user type for this controller, used in validation
+	 *
+	 * @return string BackendService::USER_* constants
+	 */
+	protected function getUserType() {
+		return BackendService::USER_ADMIN;
+	}
+
+
 }
diff --git a/apps/files_external/controller/storagescontroller.php b/apps/files_external/controller/storagescontroller.php
index 3d91af8bd8f..46202c8ba4a 100644
--- a/apps/files_external/controller/storagescontroller.php
+++ b/apps/files_external/controller/storagescontroller.php
@@ -36,6 +36,7 @@ use \OCA\Files_External\Lib\Backend\Backend;
 use \OCA\Files_External\Lib\Auth\AuthMechanism;
 use \OCP\Files\StorageNotAvailableException;
 use \OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException;
+use \OCA\Files_External\Service\BackendService;
 
 /**
  * Base class for storages controllers
@@ -124,10 +125,11 @@ abstract class StoragesController extends Controller {
 	 * Validate storage config
 	 *
 	 * @param StorageConfig $storage storage config
+	 * @param int $permissionCheck permission to check
 	 *
 	 * @return DataResponse|null returns response in case of validation error
 	 */
-	protected function validate(StorageConfig $storage) {
+	protected function validate(StorageConfig $storage, $permissionCheck = BackendService::PERMISSION_CREATE) {
 		$mountPoint = $storage->getMountPoint();
 		if ($mountPoint === '' || $mountPoint === '/') {
 			return new DataResponse(
@@ -138,6 +140,16 @@ abstract class StoragesController extends Controller {
 			);
 		}
 
+		if ($storage->getBackendOption('objectstore')) {
+			// objectstore must not be sent from client side
+			return new DataResponse(
+				array(
+					'message' => (string)$this->l10n->t('Objectstore forbidden')
+				),
+				Http::STATUS_UNPROCESSABLE_ENTITY
+			);
+		}
+
 		/** @var Backend */
 		$backend = $storage->getBackend();
 		/** @var AuthMechanism */
@@ -147,12 +159,36 @@ abstract class StoragesController extends Controller {
 			return new DataResponse(
 				array(
 					'message' => (string)$this->l10n->t('Invalid storage backend "%s"', [
-						$storage->getBackend()->getIdentifier()
+						$backend->getIdentifier()
 					])
 				),
 				Http::STATUS_UNPROCESSABLE_ENTITY
 			);
 		}
+
+		if (!$backend->isPermitted($this->getUserType(), $permissionCheck)) {
+			// not permitted to use backend
+			return new DataResponse(
+				array(
+					'message' => (string)$this->l10n->t('Not permitted to use backend "%s"', [
+						$backend->getIdentifier()
+					])
+				),
+				Http::STATUS_UNPROCESSABLE_ENTITY
+			);
+		}
+		if (!$authMechanism->isPermitted($this->getUserType(), $permissionCheck)) {
+			// not permitted to use auth mechanism
+			return new DataResponse(
+				array(
+					'message' => (string)$this->l10n->t('Not permitted to use authentication mechanism "%s"', [
+						$authMechanism->getIdentifier()
+					])
+				),
+				Http::STATUS_UNPROCESSABLE_ENTITY
+			);
+		}
+
 		if (!$backend->validateStorage($storage)) {
 			// unsatisfied parameters
 			return new DataResponse(
@@ -176,6 +212,13 @@ abstract class StoragesController extends Controller {
 	}
 
 	/**
+	 * Get the user type for this controller, used in validation
+	 *
+	 * @return string BackendService::USER_* constants
+	 */
+	abstract protected function getUserType();
+
+	/**
 	 * Check whether the given storage is available / valid.
 	 *
 	 * Note that this operation can be time consuming depending
diff --git a/apps/files_external/controller/userstoragescontroller.php b/apps/files_external/controller/userstoragescontroller.php
index 0d41e088a76..801c9ab0aae 100644
--- a/apps/files_external/controller/userstoragescontroller.php
+++ b/apps/files_external/controller/userstoragescontroller.php
@@ -62,38 +62,6 @@ class UserStoragesController extends StoragesController {
 	}
 
 	/**
-	 * Validate storage config
-	 *
-	 * @param StorageConfig $storage storage config
-	 *
-	 * @return DataResponse|null returns response in case of validation error
-	 */
-	protected function validate(StorageConfig $storage) {
-		$result = parent::validate($storage);
-
-		if ($result !== null) {
-			return $result;
-		}
-
-		// Verify that the mount point applies for the current user
-		// Prevent non-admin users from mounting local storage and other disabled backends
-		/** @var Backend */
-		$backend = $storage->getBackend();
-		if (!$backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) {
-			return new DataResponse(
-				array(
-					'message' => (string)$this->l10n->t('Admin-only storage backend "%s"', [
-						$storage->getBackend()->getIdentifier()
-					])
-				),
-				Http::STATUS_UNPROCESSABLE_ENTITY
-			);
-		}
-
-		return null;
-	}
-
-	/**
 	 * Return storage
 	 *
 	 * @NoAdminRequired
@@ -135,7 +103,7 @@ class UserStoragesController extends StoragesController {
 			return $newStorage;
 		}
 
-		$response = $this->validate($newStorage);
+		$response = $this->validate($newStorage, BackendService::PERMISSION_CREATE);
 		if (!empty($response)) {
 			return $response;
 		}
@@ -183,7 +151,7 @@ class UserStoragesController extends StoragesController {
 		}
 		$storage->setId($id);
 
-		$response = $this->validate($storage);
+		$response = $this->validate($storage, BackendService::PERMISSION_MODIFY);
 		if (!empty($response)) {
 			return $response;
 		}
@@ -218,4 +186,14 @@ class UserStoragesController extends StoragesController {
 	public function destroy($id) {
 		return parent::destroy($id);
 	}
+
+	/**
+	 * Get the user type for this controller, used in validation
+	 *
+	 * @return string BackendService::USER_* constants
+	 */
+	protected function getUserType() {
+		return BackendService::USER_PERSONAL;
+	}
+
 }
diff --git a/apps/files_external/js/dropbox.js b/apps/files_external/js/dropbox.js
deleted file mode 100644
index 53b5d5d666f..00000000000
--- a/apps/files_external/js/dropbox.js
+++ /dev/null
@@ -1,111 +0,0 @@
-$(document).ready(function() {
-
-	$('#externalStorage tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Dropbox').each(function() {
-		var configured = $(this).find('[data-parameter="configured"]');
-		if ($(configured).val() == 'true') {
-			$(this).find('.configuration input').attr('disabled', 'disabled');
-			$(this).find('.configuration').append('<span id="access" style="padding-left:0.5em;">'+t('files_external', 'Access granted')+'</span>');
-		} else {
-			var app_key = $(this).find('.configuration [data-parameter="app_key"]').val();
-			var app_secret = $(this).find('.configuration [data-parameter="app_secret"]').val();
-			var config = $(this).find('.configuration');
-			if (app_key != '' && app_secret != '') {
-				var pos = window.location.search.indexOf('oauth_token') + 12;
-				var token = $(this).find('.configuration [data-parameter="token"]');
-				if (pos != -1 && window.location.search.substr(pos, $(token).val().length) == $(token).val()) {
-					var token_secret = $(this).find('.configuration [data-parameter="token_secret"]');
-					var tr = $(this);
-					var statusSpan = $(tr).find('.status span');
-					statusSpan.removeClass();
-					statusSpan.addClass('waiting');
-					$.post(OC.filePath('files_external', 'ajax', 'dropbox.php'), { step: 2, app_key: app_key, app_secret: app_secret, request_token: $(token).val(), request_token_secret: $(token_secret).val() }, function(result) {
-						if (result && result.status == 'success') {
-							$(token).val(result.access_token);
-							$(token_secret).val(result.access_token_secret);
-							$(configured).val('true');
-							OCA.External.Settings.mountConfig.saveStorageConfig(tr, function(status) {
-								if (status) {
-									$(tr).find('.configuration input').attr('disabled', 'disabled');
-									$(tr).find('.configuration').append('<span id="access" style="padding-left:0.5em;">'+t('files_external', 'Access granted')+'</span>');
-								}
-							});
-						} else {
-							OC.dialogs.alert(result.data.message, t('files_external', 'Error configuring Dropbox storage'));
-						}
-					});
-				}
-			} else {
-				onDropboxInputsChange($(this));
-			}
-		}
-	});
-
-	$('#externalStorage').on('paste', 'tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Dropbox td', function() {
-		var tr = $(this).parent();
-		setTimeout(function() {
-			onDropboxInputsChange(tr);
-		}, 20);
-	});
-
-	$('#externalStorage').on('keyup', 'tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Dropbox td', function() {
-		onDropboxInputsChange($(this).parent());
-	});
-
-	$('#externalStorage').on('change', 'tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Dropbox .chzn-select', function() {
-		onDropboxInputsChange($(this).parent().parent());
-	});
-
-	function onDropboxInputsChange(tr) {
-		if ($(tr).find('[data-parameter="configured"]').val() != 'true') {
-			var config = $(tr).find('.configuration');
-			if ($(tr).find('.mountPoint input').val() != ''
-				&& $(config).find('[data-parameter="app_key"]').val() != ''
-				&& $(config).find('[data-parameter="app_secret"]').val() != ''
-				&& ($(tr).find('.chzn-select').length == 0
-				|| $(tr).find('.chzn-select').val() != null))
-			{
-				if ($(tr).find('.dropbox').length == 0) {
-					$(config).append($(document.createElement('input'))
-						.addClass('button dropbox')
-						.attr('type', 'button')
-						.attr('value', t('files_external', 'Grant access')));
-				} else {
-					$(tr).find('.dropbox').show();
-				}
-			} else if ($(tr).find('.dropbox').length > 0) {
-				$(tr).find('.dropbox').hide();
-			}
-		}
-	}
-
-	$('#externalStorage').on('click', '.dropbox', function(event) {
-		event.preventDefault();
-		var tr = $(this).parent().parent();
-		var app_key = $(this).parent().find('[data-parameter="app_key"]').val();
-		var app_secret = $(this).parent().find('[data-parameter="app_secret"]').val();
-		if (app_key != '' && app_secret != '') {
-			var tr = $(this).parent().parent();
-			var configured = $(this).parent().find('[data-parameter="configured"]');
-			var token = $(this).parent().find('[data-parameter="token"]');
-			var token_secret = $(this).parent().find('[data-parameter="token_secret"]');
-			$.post(OC.filePath('files_external', 'ajax', 'dropbox.php'), { step: 1, app_key: app_key, app_secret: app_secret, callback: location.protocol + '//' + location.host + location.pathname }, function(result) {
-				if (result && result.status == 'success') {
-					$(configured).val('false');
-					$(token).val(result.data.request_token);
-					$(token_secret).val(result.data.request_token_secret);
-					OCA.External.Settings.mountConfig.saveStorageConfig(tr, function() {
-						window.location = result.data.url;
-					});
-				} else {
-					OC.dialogs.alert(result.data.message, t('files_external', 'Error configuring Dropbox storage'));
-				}
-			});
-		} else {
-			OC.dialogs.alert(
-				t('files_external', 'Please provide a valid Dropbox app key and secret.'),
-				t('files_external', 'Error configuring Dropbox storage')
-			);
-		}
-	});
-
-});
diff --git a/apps/files_external/js/google.js b/apps/files_external/js/google.js
deleted file mode 100644
index 648538f8028..00000000000
--- a/apps/files_external/js/google.js
+++ /dev/null
@@ -1,131 +0,0 @@
-$(document).ready(function() {
-
-	$('#externalStorage tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Google').each(function() {
-		var configured = $(this).find('[data-parameter="configured"]');
-		if ($(configured).val() == 'true') {
-			$(this).find('.configuration input').attr('disabled', 'disabled');
-			$(this).find('.configuration').append($('<span/>').attr('id', 'access')
-				.text(t('files_external', 'Access granted')));
-		} else {
-			var client_id = $(this).find('.configuration [data-parameter="client_id"]').val();
-			var client_secret = $(this).find('.configuration [data-parameter="client_secret"]')
-				.val();
-			if (client_id != '' && client_secret != '') {
-				var params = {};
-				window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function(m, key, value) {
-					params[key] = value;
-				});
-				if (params['code'] !== undefined) {
-					var tr = $(this);
-					var token = $(this).find('.configuration [data-parameter="token"]');
-					var statusSpan = $(tr).find('.status span');
-					statusSpan.removeClass();
-					statusSpan.addClass('waiting');
-					$.post(OC.filePath('files_external', 'ajax', 'google.php'),
-						{
-							step: 2,
-							client_id: client_id,
-							client_secret: client_secret,
-							redirect: location.protocol + '//' + location.host + location.pathname,
-							code: params['code'],
-						}, function(result) {
-							if (result && result.status == 'success') {
-								$(token).val(result.data.token);
-								$(configured).val('true');
-								OCA.External.Settings.mountConfig.saveStorageConfig(tr, function(status) {
-									if (status) {
-										$(tr).find('.configuration input').attr('disabled', 'disabled');
-										$(tr).find('.configuration').append($('<span/>')
-											.attr('id', 'access')
-											.text(t('files_external', 'Access granted')));
-									}
-								});
-							} else {
-								OC.dialogs.alert(result.data.message,
-									t('files_external', 'Error configuring Google Drive storage')
-								);
-							}
-						}
-					);
-				}
-			} else {
-				onGoogleInputsChange($(this));
-			}
-		}
-	});
-
-	$('#externalStorage').on('paste', 'tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Google td',
-		function() {
-			var tr = $(this).parent();
-			setTimeout(function() {
-				onGoogleInputsChange(tr);
-			}, 20);
-		}
-	);
-
-	$('#externalStorage').on('keyup', 'tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Google td',
-		function() {
-			onGoogleInputsChange($(this).parent());
-		}
-	);
-
-	$('#externalStorage').on('change', 'tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Google .chzn-select'
-		, function() {
-			onGoogleInputsChange($(this).parent().parent());
-		}
-	);
-
-	function onGoogleInputsChange(tr) {
-		if ($(tr).find('[data-parameter="configured"]').val() != 'true') {
-			var config = $(tr).find('.configuration');
-			if ($(tr).find('.mountPoint input').val() != ''
-				&& $(config).find('[data-parameter="client_id"]').val() != ''
-				&& $(config).find('[data-parameter="client_secret"]').val() != ''
-				&& ($(tr).find('.chzn-select').length == 0
-				|| $(tr).find('.chzn-select').val() != null))
-			{
-				if ($(tr).find('.google').length == 0) {
-					$(config).append($(document.createElement('input')).addClass('button google')
-						.attr('type', 'button')
-						.attr('value', t('files_external', 'Grant access')));
-				} else {
-					$(tr).find('.google').show();
-				}
-			} else if ($(tr).find('.google').length > 0) {
-				$(tr).find('.google').hide();
-			}
-		}
-	}
-
-	$('#externalStorage').on('click', '.google', function(event) {
-		event.preventDefault();
-		var tr = $(this).parent().parent();
-		var configured = $(this).parent().find('[data-parameter="configured"]');
-		var client_id = $(this).parent().find('[data-parameter="client_id"]').val();
-		var client_secret = $(this).parent().find('[data-parameter="client_secret"]').val();
-		if (client_id != '' && client_secret != '') {
-			var token = $(this).parent().find('[data-parameter="token"]');
-			$.post(OC.filePath('files_external', 'ajax', 'google.php'),
-				{
-					step: 1,
-					client_id: client_id,
-					client_secret: client_secret,
-					redirect: location.protocol + '//' + location.host + location.pathname,
-				}, function(result) {
-					if (result && result.status == 'success') {
-						$(configured).val('false');
-						$(token).val('false');
-						OCA.External.Settings.mountConfig.saveStorageConfig(tr, function(status) {
-							window.location = result.data.url;
-						});
-					} else {
-						OC.dialogs.alert(result.data.message,
-							t('files_external', 'Error configuring Google Drive storage')
-						);
-					}
-				}
-			);
-		}
-	});
-
-});
diff --git a/apps/files_external/js/oauth1.js b/apps/files_external/js/oauth1.js
new file mode 100644
index 00000000000..47aca36871f
--- /dev/null
+++ b/apps/files_external/js/oauth1.js
@@ -0,0 +1,78 @@
+$(document).ready(function() {
+
+	OCA.External.Settings.mountConfig.whenSelectAuthMechanism(function($tr, authMechanism, scheme) {
+		if (authMechanism === 'oauth1::oauth1') {
+			var config = $tr.find('.configuration');
+			config.append($(document.createElement('input'))
+				.addClass('button auth-param')
+				.attr('type', 'button')
+				.attr('value', t('files_external', 'Grant access'))
+				.attr('name', 'oauth1_grant')
+			);
+
+			var configured = $tr.find('[data-parameter="configured"]');
+			if ($(configured).val() == 'true') {
+				$tr.find('.configuration input').attr('disabled', 'disabled');
+				$tr.find('.configuration').append('<span id="access" style="padding-left:0.5em;">'+t('files_external', 'Access granted')+'</span>');
+			} else {
+				var app_key = $tr.find('.configuration [data-parameter="app_key"]').val();
+				var app_secret = $tr.find('.configuration [data-parameter="app_secret"]').val();
+				if (app_key != '' && app_secret != '') {
+					var pos = window.location.search.indexOf('oauth_token') + 12;
+					var token = $tr.find('.configuration [data-parameter="token"]');
+					if (pos != -1 && window.location.search.substr(pos, $(token).val().length) == $(token).val()) {
+						var token_secret = $tr.find('.configuration [data-parameter="token_secret"]');
+						var statusSpan = $tr.find('.status span');
+						statusSpan.removeClass();
+						statusSpan.addClass('waiting');
+						$.post(OC.filePath('files_external', 'ajax', 'oauth1.php'), { step: 2, app_key: app_key, app_secret: app_secret, request_token: $(token).val(), request_token_secret: $(token_secret).val() }, function(result) {
+							if (result && result.status == 'success') {
+								$(token).val(result.access_token);
+								$(token_secret).val(result.access_token_secret);
+								$(configured).val('true');
+								OCA.External.Settings.mountConfig.saveStorageConfig($tr, function(status) {
+									if (status) {
+										$tr.find('.configuration input').attr('disabled', 'disabled');
+										$tr.find('.configuration').append('<span id="access" style="padding-left:0.5em;">'+t('files_external', 'Access granted')+'</span>');
+									}
+								});
+							} else {
+								OC.dialogs.alert(result.data.message, t('files_external', 'Error configuring OAuth1'));
+							}
+						});
+					}
+				}
+			}
+		}
+	});
+
+	$('#externalStorage').on('click', '[name="oauth1_grant"]', function(event) {
+		event.preventDefault();
+		var tr = $(this).parent().parent();
+		var app_key = $(this).parent().find('[data-parameter="app_key"]').val();
+		var app_secret = $(this).parent().find('[data-parameter="app_secret"]').val();
+		if (app_key != '' && app_secret != '') {
+			var configured = $(this).parent().find('[data-parameter="configured"]');
+			var token = $(this).parent().find('[data-parameter="token"]');
+			var token_secret = $(this).parent().find('[data-parameter="token_secret"]');
+			$.post(OC.filePath('files_external', 'ajax', 'oauth1.php'), { step: 1, app_key: app_key, app_secret: app_secret, callback: location.protocol + '//' + location.host + location.pathname }, function(result) {
+				if (result && result.status == 'success') {
+					$(configured).val('false');
+					$(token).val(result.data.request_token);
+					$(token_secret).val(result.data.request_token_secret);
+					OCA.External.Settings.mountConfig.saveStorageConfig(tr, function() {
+						window.location = result.data.url;
+					});
+				} else {
+					OC.dialogs.alert(result.data.message, t('files_external', 'Error configuring OAuth1'));
+				}
+			});
+		} else {
+			OC.dialogs.alert(
+				t('files_external', 'Please provide a valid app key and secret.'),
+				t('files_external', 'Error configuring OAuth1')
+			);
+		}
+	});
+
+});
diff --git a/apps/files_external/js/oauth2.js b/apps/files_external/js/oauth2.js
new file mode 100644
index 00000000000..84941437420
--- /dev/null
+++ b/apps/files_external/js/oauth2.js
@@ -0,0 +1,95 @@
+$(document).ready(function() {
+
+	OCA.External.Settings.mountConfig.whenSelectAuthMechanism(function($tr, authMechanism, scheme) {
+		if (authMechanism === 'oauth2::oauth2') {
+			var config = $tr.find('.configuration');
+			config.append($(document.createElement('input'))
+				.addClass('button auth-param')
+				.attr('type', 'button')
+				.attr('value', t('files_external', 'Grant access'))
+				.attr('name', 'oauth2_grant')
+			);
+
+			var configured = $tr.find('[data-parameter="configured"]');
+			if ($(configured).val() == 'true') {
+				$tr.find('.configuration input').attr('disabled', 'disabled');
+				$tr.find('.configuration').append($('<span/>').attr('id', 'access')
+						.text(t('files_external', 'Access granted')));
+			} else {
+				var client_id = $tr.find('.configuration [data-parameter="client_id"]').val();
+				var client_secret = $tr.find('.configuration [data-parameter="client_secret"]')
+					.val();
+				if (client_id != '' && client_secret != '') {
+					var params = {};
+					window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function(m, key, value) {
+						params[key] = value;
+					});
+					if (params['code'] !== undefined) {
+						var token = $tr.find('.configuration [data-parameter="token"]');
+						var statusSpan = $tr.find('.status span');
+						statusSpan.removeClass();
+						statusSpan.addClass('waiting');
+						$.post(OC.filePath('files_external', 'ajax', 'oauth2.php'),
+								{
+									step: 2,
+									client_id: client_id,
+									client_secret: client_secret,
+									redirect: location.protocol + '//' + location.host + location.pathname,
+									code: params['code'],
+								}, function(result) {
+									if (result && result.status == 'success') {
+										$(token).val(result.data.token);
+										$(configured).val('true');
+										OCA.External.Settings.mountConfig.saveStorageConfig($tr, function(status) {
+											if (status) {
+												$tr.find('.configuration input').attr('disabled', 'disabled');
+												$tr.find('.configuration').append($('<span/>')
+														.attr('id', 'access')
+														.text(t('files_external', 'Access granted')));
+											}
+										});
+									} else {
+										OC.dialogs.alert(result.data.message,
+												t('files_external', 'Error configuring OAuth2')
+												);
+									}
+								}
+						);
+					}
+				}
+			}
+		}
+	});
+
+	$('#externalStorage').on('click', '[name="oauth2_grant"]', function(event) {
+		event.preventDefault();
+		var tr = $(this).parent().parent();
+		var configured = $(this).parent().find('[data-parameter="configured"]');
+		var client_id = $(this).parent().find('[data-parameter="client_id"]').val();
+		var client_secret = $(this).parent().find('[data-parameter="client_secret"]').val();
+		if (client_id != '' && client_secret != '') {
+			var token = $(this).parent().find('[data-parameter="token"]');
+			$.post(OC.filePath('files_external', 'ajax', 'oauth2.php'),
+				{
+					step: 1,
+					client_id: client_id,
+					client_secret: client_secret,
+					redirect: location.protocol + '//' + location.host + location.pathname,
+				}, function(result) {
+					if (result && result.status == 'success') {
+						$(configured).val('false');
+						$(token).val('false');
+						OCA.External.Settings.mountConfig.saveStorageConfig(tr, function(status) {
+							window.location = result.data.url;
+						});
+					} else {
+						OC.dialogs.alert(result.data.message,
+							t('files_external', 'Error configuring OAuth2')
+						);
+					}
+				}
+			);
+		}
+	});
+
+});
diff --git a/apps/files_external/js/public_key.js b/apps/files_external/js/public_key.js
new file mode 100644
index 00000000000..a8546067452
--- /dev/null
+++ b/apps/files_external/js/public_key.js
@@ -0,0 +1,46 @@
+$(document).ready(function() {
+
+	OCA.External.Settings.mountConfig.whenSelectAuthMechanism(function($tr, authMechanism, scheme) {
+		if (scheme === 'publickey') {
+			var config = $tr.find('.configuration');
+			if ($(config).find('[name="public_key_generate"]').length === 0) {
+				setupTableRow($tr, config);
+			}
+		}
+	});
+
+	$('#externalStorage').on('click', '[name="public_key_generate"]', function(event) {
+		event.preventDefault();
+		var tr = $(this).parent().parent();
+		generateKeys(tr);
+	});
+
+	function setupTableRow(tr, config) {
+		$(config).append($(document.createElement('input'))
+			.addClass('button auth-param')
+			.attr('type', 'button')
+			.attr('value', t('files_external', 'Generate keys'))
+			.attr('name', 'public_key_generate')
+		);
+		// If there's no private key, build one
+		if (0 === $(config).find('[data-parameter="private_key"]').val().length) {
+			generateKeys(tr);
+		}
+	}
+
+	function generateKeys(tr) {
+		var config = $(tr).find('.configuration');
+
+		$.post(OC.filePath('files_external', 'ajax', 'public_key.php'), {}, function(result) {
+			if (result && result.status === 'success') {
+				$(config).find('[data-parameter="public_key"]').val(result.data.public_key);
+				$(config).find('[data-parameter="private_key"]').val(result.data.private_key);
+				OCA.External.Settings.mountConfig.saveStorageConfig(tr, function() {
+					// Nothing to do
+				});
+			} else {
+				OC.dialogs.alert(result.data.message, t('files_external', 'Error generating key pair') );
+			}
+		});
+	}
+});
diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index d3e20e38445..bf9981adabf 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -550,7 +550,7 @@ var MountConfigListView = function($el, options) {
 /**
  * @memberOf OCA.External.Settings
  */
-MountConfigListView.prototype = {
+MountConfigListView.prototype = _.extend({
 
 	/**
 	 * jQuery element containing the config list
@@ -644,11 +644,31 @@ MountConfigListView.prototype = {
 
 		addSelect2(this.$el.find('tr:not(#addMountPoint) .applicableUsers'), this._userListLimit);
 
-		this.$el.find('tr:not(#addMountPoint)').each(function(i, tr) {
+		this._initEvents();
+
+		this.$el.find('tbody tr:not(#addMountPoint)').each(function(i, tr) {
 			self.recheckStorageConfig($(tr));
 		});
+	},
 
-		this._initEvents();
+	/**
+	 * Custom JS event handlers
+	 * Trigger callback for all existing configurations
+	 */
+	whenSelectBackend: function(callback) {
+		this.$el.find('tbody tr:not(#addMountPoint)').each(function(i, tr) {
+			var backend = $(tr).find('.backend').data('class');
+			callback($(tr), backend);
+		});
+		this.on('selectBackend', callback);
+	},
+	whenSelectAuthMechanism: function(callback) {
+		var self = this;
+		this.$el.find('tbody tr:not(#addMountPoint)').each(function(i, tr) {
+			var authMechanism = $(tr).find('.selectAuthMechanism').val();
+			callback($(tr), authMechanism, self._allAuthMechanisms[authMechanism]['scheme']);
+		});
+		this.on('selectAuthMechanism', callback);
 	},
 
 	/**
@@ -728,12 +748,21 @@ MountConfigListView.prototype = {
 		var $td = $tr.find('td.configuration');
 		$.each(backendConfiguration['configuration'], _.partial(this.writeParameterInput, $td));
 
+		this.trigger('selectBackend', $tr, backend);
+
 		selectAuthMechanism.trigger('change'); // generate configuration parameters for auth mechanism
 
 		var priorityEl = $('<input type="hidden" class="priority" value="' + backendConfiguration['priority'] + '" />');
 		$tr.append(priorityEl);
 		$td.children().not('[type=hidden]').first().focus();
 
+		// FIXME default backend mount options
+		$tr.find('input.mountOptions').val(JSON.stringify({
+			'encrypt': true,
+			'previews': true,
+			'filesystem_check_changes': 1
+		}));
+
 		$tr.find('td').last().attr('class', 'remove');
 		$tr.find('td.mountOptionsToggle').removeClass('hidden');
 		$tr.find('td').last().removeAttr('style');
@@ -758,6 +787,10 @@ MountConfigListView.prototype = {
 			this.writeParameterInput, $td, _, _, ['auth-param']
 		));
 
+		this.trigger('selectAuthMechanism',
+			$tr, authMechanism, authMechanismConfiguration['scheme']
+		);
+
 		if ($tr.data('constructing') !== true) {
 			// row is ready, trigger recheck
 			this.saveStorageConfig($tr);
@@ -1045,7 +1078,7 @@ MountConfigListView.prototype = {
 			self.saveStorageConfig($tr);
 		});
 	}
-};
+}, OC.Backbone.Events);
 
 $(document).ready(function() {
 	var enabled = $('#files_external').attr('data-encryption-enabled');
diff --git a/apps/files_external/js/sftp_key.js b/apps/files_external/js/sftp_key.js
deleted file mode 100644
index 55b11b1fac9..00000000000
--- a/apps/files_external/js/sftp_key.js
+++ /dev/null
@@ -1,53 +0,0 @@
-$(document).ready(function() {
-
-	$('#externalStorage tbody tr.\\\\OC\\\\Files\\\\Storage\\\\SFTP_Key').each(function() {
-		var tr = $(this);
-		var config = $(tr).find('.configuration');
-		if ($(config).find('.sftp_key').length === 0) {
-			setupTableRow(tr, config);
-		}
-	});
-
-	// We can't catch the DOM elements being added, but we can pick up when
-	// they receive focus
-	$('#externalStorage').on('focus', 'tbody tr.\\\\OC\\\\Files\\\\Storage\\\\SFTP_Key', function() {
-		var tr = $(this);
-		var config = $(tr).find('.configuration');
-
-		if ($(config).find('.sftp_key').length === 0) {
-			setupTableRow(tr, config);
-		}
-	});
-
-	$('#externalStorage').on('click', '.sftp_key', function(event) {
-		event.preventDefault();
-		var tr = $(this).parent().parent();
-		generateKeys(tr);
-	});
-
-	function setupTableRow(tr, config) {
-		$(config).append($(document.createElement('input')).addClass('button sftp_key')
-			.attr('type', 'button')
-			.attr('value', t('files_external', 'Generate keys')));
-		// If there's no private key, build one
-		if (0 === $(config).find('[data-parameter="private_key"]').val().length) {
-			generateKeys(tr);
-		}
-	}
-
-	function generateKeys(tr) {
-		var config = $(tr).find('.configuration');
-
-		$.post(OC.filePath('files_external', 'ajax', 'sftp_key.php'), {}, function(result) {
-			if (result && result.status === 'success') {
-				$(config).find('[data-parameter="public_key"]').val(result.data.public_key);
-				$(config).find('[data-parameter="private_key"]').val(result.data.private_key);
-				OCA.External.mountConfig.saveStorageConfig(tr, function() {
-					// Nothing to do
-				});
-			} else {
-				OC.dialogs.alert(result.data.message, t('files_external', 'Error generating key pair') );
-			}
-		});
-	}
-});
diff --git a/apps/files_external/l10n/af_ZA.js b/apps/files_external/l10n/af_ZA.js
index 1c56071d430..d28e14d67ce 100644
--- a/apps/files_external/l10n/af_ZA.js
+++ b/apps/files_external/l10n/af_ZA.js
@@ -1,9 +1,9 @@
 OC.L10N.register(
     "files_external",
     {
+    "Personal" : "Persoonlik",
     "Username" : "Gebruikersnaam",
     "Password" : "Wagwoord",
-    "Share" : "Deel",
-    "Personal" : "Persoonlik"
+    "Share" : "Deel"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/af_ZA.json b/apps/files_external/l10n/af_ZA.json
index ddb14146649..53622f796ff 100644
--- a/apps/files_external/l10n/af_ZA.json
+++ b/apps/files_external/l10n/af_ZA.json
@@ -1,7 +1,7 @@
 { "translations": {
+    "Personal" : "Persoonlik",
     "Username" : "Gebruikersnaam",
     "Password" : "Wagwoord",
-    "Share" : "Deel",
-    "Personal" : "Persoonlik"
+    "Share" : "Deel"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/ar.js b/apps/files_external/l10n/ar.js
index 174b0d1d547..3e7438796f4 100644
--- a/apps/files_external/l10n/ar.js
+++ b/apps/files_external/l10n/ar.js
@@ -1,27 +1,26 @@
 OC.L10N.register(
     "files_external",
     {
-    "Local" : "محلي",
-    "Location" : "المكان",
-    "Key" : "المفتاح",
-    "Secret" : "سر",
+    "Personal" : "شخصي",
+    "System" : "النظام",
+    "Never" : "أبدا",
+    "Saved" : "حفظ",
+    "None" : "لا شيء",
+    "App key" : "مفتاح التطبيق",
+    "App secret" : "التطبيق السري",
+    "Username" : "إسم المستخدم",
+    "Password" : "كلمة السر",
     "Bucket" : "الحزمة",
-    "Access Key" : "مفتاح الدخول",
-    "Secret Key" : "المفتاح السري",
     "Hostname" : "إسم الإستضافة",
     "Port" : "المنفذ",
     "Region" : "المنطقة",
-    "App key" : "مفتاح التطبيق",
-    "App secret" : "التطبيق السري",
+    "WebDAV" : "WebDAV",
+    "URL" : "عنوان الموقع",
     "Host" : "المضيف",
-    "Username" : "إسم المستخدم",
-    "Password" : "كلمة السر",
+    "Local" : "محلي",
+    "Location" : "المكان",
+    "ownCloud" : "ownCloud",
     "Share" : "شارك",
-    "URL" : "عنوان الموقع",
-    "Personal" : "شخصي",
-    "System" : "النظام",
-    "Never" : "أبدا",
-    "Saved" : "حفظ",
     "Name" : "اسم",
     "Folder name" : "اسم المجلد",
     "Configuration" : "إعداد",
diff --git a/apps/files_external/l10n/ar.json b/apps/files_external/l10n/ar.json
index 582813959dc..29423a07906 100644
--- a/apps/files_external/l10n/ar.json
+++ b/apps/files_external/l10n/ar.json
@@ -1,25 +1,24 @@
 { "translations": {
-    "Local" : "محلي",
-    "Location" : "المكان",
-    "Key" : "المفتاح",
-    "Secret" : "سر",
+    "Personal" : "شخصي",
+    "System" : "النظام",
+    "Never" : "أبدا",
+    "Saved" : "حفظ",
+    "None" : "لا شيء",
+    "App key" : "مفتاح التطبيق",
+    "App secret" : "التطبيق السري",
+    "Username" : "إسم المستخدم",
+    "Password" : "كلمة السر",
     "Bucket" : "الحزمة",
-    "Access Key" : "مفتاح الدخول",
-    "Secret Key" : "المفتاح السري",
     "Hostname" : "إسم الإستضافة",
     "Port" : "المنفذ",
     "Region" : "المنطقة",
-    "App key" : "مفتاح التطبيق",
-    "App secret" : "التطبيق السري",
+    "WebDAV" : "WebDAV",
+    "URL" : "عنوان الموقع",
     "Host" : "المضيف",
-    "Username" : "إسم المستخدم",
-    "Password" : "كلمة السر",
+    "Local" : "محلي",
+    "Location" : "المكان",
+    "ownCloud" : "ownCloud",
     "Share" : "شارك",
-    "URL" : "عنوان الموقع",
-    "Personal" : "شخصي",
-    "System" : "النظام",
-    "Never" : "أبدا",
-    "Saved" : "حفظ",
     "Name" : "اسم",
     "Folder name" : "اسم المجلد",
     "Configuration" : "إعداد",
diff --git a/apps/files_external/l10n/ast.js b/apps/files_external/l10n/ast.js
index 3b3f06a712a..b6084cc1545 100644
--- a/apps/files_external/l10n/ast.js
+++ b/apps/files_external/l10n/ast.js
@@ -1,58 +1,46 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Falló la descarga de los tokens solicitaos. Verifica que la clave y el secretu de la app de Dropbox ye correuta.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Falló la descarga de los tokens solicitaos. Verifica que la clave y el secretu de la app de Dropbox ye correuta.",
-    "Please provide a valid Dropbox app key and secret." : "Por favor, proporciona una clave válida de l'app Dropbox y una clave secreta.",
     "Step 1 failed. Exception: %s" : "Pasu 1 fallíu. Esceición: %s",
     "Step 2 failed. Exception: %s" : "Pasu 2 fallíu. Esceición: %s",
     "External storage" : "Almacenamientu esternu",
-    "Local" : "Llocal",
-    "Location" : "Llocalización",
+    "Personal" : "Personal",
+    "System" : "Sistema",
+    "Grant access" : "Conceder accesu",
+    "Access granted" : "Accesu concedíu",
+    "All users. Type to select user or group." : "Tolos usuarios. Escribe pa seleccionar usuariu o grupu.",
+    "(group)" : "(grupu)",
+    "Saved" : "Guardáu",
+    "None" : "Dengún",
+    "App key" : "App principal",
+    "App secret" : "App secreta",
+    "Client ID" : "ID de veceru",
+    "Client secret" : "Veceru secretu",
+    "Username" : "Nome d'usuariu",
+    "Password" : "Contraseña",
+    "API key" : "clave API",
+    "Public key" : "Clave pública",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Clave",
-    "Secret" : "Secretu",
     "Bucket" : "Depósitu",
-    "Amazon S3 and compliant" : "Amazon S3 y compatibilidá",
-    "Access Key" : "Clave d'accesu",
-    "Secret Key" : "Clave Secreta",
     "Hostname" : "Nome d'agospiu",
     "Port" : "Puertu",
     "Region" : "Rexón",
     "Enable SSL" : "Habilitar SSL",
     "Enable Path Style" : "Habilitar Estilu de ruta",
-    "App key" : "App principal",
-    "App secret" : "App secreta",
-    "Host" : "Sirvidor",
-    "Username" : "Nome d'usuariu",
-    "Password" : "Contraseña",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Remote subfolder" : "Subcarpeta remota",
+    "Secure https://" : "Secure https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Sirvidor",
     "Secure ftps://" : "Secure ftps://",
-    "Client ID" : "ID de veceru",
-    "Client secret" : "Veceru secretu",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Rexón (opcional pa OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Clave API (necesaria pa Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nome d'inquilín (necesariu pa OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Contraseña (necesaria pa OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nome de Serviciu (necesariu pa OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL d'identidá de puntu final (necesariu pa OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Tiempu d'espera de peticiones HTTP en segundos",
+    "Local" : "Llocal",
+    "Location" : "Llocalización",
+    "ownCloud" : "ownCloud",
+    "Root" : "Raíz",
     "Share" : "Compartir",
-    "SMB / CIFS using OC login" : "SMB / CIFS usando accesu OC",
     "Username as share" : "Nome d'usuariu como Compartición",
-    "URL" : "URL",
-    "Secure https://" : "Secure https://",
-    "Public key" : "Clave pública",
-    "Access granted" : "Accesu concedíu",
-    "Error configuring Dropbox storage" : "Fallu configurando l'almacenamientu de Dropbox",
-    "Grant access" : "Conceder accesu",
-    "Error configuring Google Drive storage" : "Fallu configurando l'almacenamientu de Google Drive",
-    "Personal" : "Personal",
-    "System" : "Sistema",
-    "All users. Type to select user or group." : "Tolos usuarios. Escribe pa seleccionar usuariu o grupu.",
-    "(group)" : "(grupu)",
-    "Saved" : "Guardáu",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Nota:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El soporte de cURL en PHP nun ta activáu o instaláu. Nun pue montase %s. Pídi-y al alministrador de sistema que lu instale.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El soporte de FTP en PHP nun ta activáu o instaláu. Nun pue montase %s. Pídi-y al alministrador de sistema que lu instale.",
@@ -64,8 +52,8 @@ OC.L10N.register(
     "Folder name" : "Nome de la carpeta",
     "Configuration" : "Configuración",
     "Available for" : "Disponible pa",
-    "Add storage" : "Amestar almacenamientu",
     "Delete" : "Desaniciar",
+    "Add storage" : "Amestar almacenamientu",
     "Enable User External Storage" : "Habilitar almacenamientu esterno d'usuariu",
     "Allow users to mount the following external storage" : "Permitir a los usuarios montar el siguiente almacenamientu esternu"
 },
diff --git a/apps/files_external/l10n/ast.json b/apps/files_external/l10n/ast.json
index c2a2d20575b..ccf882952ae 100644
--- a/apps/files_external/l10n/ast.json
+++ b/apps/files_external/l10n/ast.json
@@ -1,56 +1,44 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Falló la descarga de los tokens solicitaos. Verifica que la clave y el secretu de la app de Dropbox ye correuta.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Falló la descarga de los tokens solicitaos. Verifica que la clave y el secretu de la app de Dropbox ye correuta.",
-    "Please provide a valid Dropbox app key and secret." : "Por favor, proporciona una clave válida de l'app Dropbox y una clave secreta.",
     "Step 1 failed. Exception: %s" : "Pasu 1 fallíu. Esceición: %s",
     "Step 2 failed. Exception: %s" : "Pasu 2 fallíu. Esceición: %s",
     "External storage" : "Almacenamientu esternu",
-    "Local" : "Llocal",
-    "Location" : "Llocalización",
+    "Personal" : "Personal",
+    "System" : "Sistema",
+    "Grant access" : "Conceder accesu",
+    "Access granted" : "Accesu concedíu",
+    "All users. Type to select user or group." : "Tolos usuarios. Escribe pa seleccionar usuariu o grupu.",
+    "(group)" : "(grupu)",
+    "Saved" : "Guardáu",
+    "None" : "Dengún",
+    "App key" : "App principal",
+    "App secret" : "App secreta",
+    "Client ID" : "ID de veceru",
+    "Client secret" : "Veceru secretu",
+    "Username" : "Nome d'usuariu",
+    "Password" : "Contraseña",
+    "API key" : "clave API",
+    "Public key" : "Clave pública",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Clave",
-    "Secret" : "Secretu",
     "Bucket" : "Depósitu",
-    "Amazon S3 and compliant" : "Amazon S3 y compatibilidá",
-    "Access Key" : "Clave d'accesu",
-    "Secret Key" : "Clave Secreta",
     "Hostname" : "Nome d'agospiu",
     "Port" : "Puertu",
     "Region" : "Rexón",
     "Enable SSL" : "Habilitar SSL",
     "Enable Path Style" : "Habilitar Estilu de ruta",
-    "App key" : "App principal",
-    "App secret" : "App secreta",
-    "Host" : "Sirvidor",
-    "Username" : "Nome d'usuariu",
-    "Password" : "Contraseña",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Remote subfolder" : "Subcarpeta remota",
+    "Secure https://" : "Secure https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Sirvidor",
     "Secure ftps://" : "Secure ftps://",
-    "Client ID" : "ID de veceru",
-    "Client secret" : "Veceru secretu",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Rexón (opcional pa OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Clave API (necesaria pa Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nome d'inquilín (necesariu pa OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Contraseña (necesaria pa OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nome de Serviciu (necesariu pa OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL d'identidá de puntu final (necesariu pa OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Tiempu d'espera de peticiones HTTP en segundos",
+    "Local" : "Llocal",
+    "Location" : "Llocalización",
+    "ownCloud" : "ownCloud",
+    "Root" : "Raíz",
     "Share" : "Compartir",
-    "SMB / CIFS using OC login" : "SMB / CIFS usando accesu OC",
     "Username as share" : "Nome d'usuariu como Compartición",
-    "URL" : "URL",
-    "Secure https://" : "Secure https://",
-    "Public key" : "Clave pública",
-    "Access granted" : "Accesu concedíu",
-    "Error configuring Dropbox storage" : "Fallu configurando l'almacenamientu de Dropbox",
-    "Grant access" : "Conceder accesu",
-    "Error configuring Google Drive storage" : "Fallu configurando l'almacenamientu de Google Drive",
-    "Personal" : "Personal",
-    "System" : "Sistema",
-    "All users. Type to select user or group." : "Tolos usuarios. Escribe pa seleccionar usuariu o grupu.",
-    "(group)" : "(grupu)",
-    "Saved" : "Guardáu",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Nota:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El soporte de cURL en PHP nun ta activáu o instaláu. Nun pue montase %s. Pídi-y al alministrador de sistema que lu instale.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El soporte de FTP en PHP nun ta activáu o instaláu. Nun pue montase %s. Pídi-y al alministrador de sistema que lu instale.",
@@ -62,8 +50,8 @@
     "Folder name" : "Nome de la carpeta",
     "Configuration" : "Configuración",
     "Available for" : "Disponible pa",
-    "Add storage" : "Amestar almacenamientu",
     "Delete" : "Desaniciar",
+    "Add storage" : "Amestar almacenamientu",
     "Enable User External Storage" : "Habilitar almacenamientu esterno d'usuariu",
     "Allow users to mount the following external storage" : "Permitir a los usuarios montar el siguiente almacenamientu esternu"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/az.js b/apps/files_external/l10n/az.js
index 6e28fa378df..9c86576c7fc 100644
--- a/apps/files_external/l10n/az.js
+++ b/apps/files_external/l10n/az.js
@@ -1,65 +1,49 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Müraciət token-nin alınmasında səhv baş verdi. Əmin olun ki, sizin Dropbox proqraminin açarı və gizlisi düzgündür.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Müraciət token-nin alınmasında səhv baş verdi. Əmin olun ki, sizin Dropbox proqraminin açarı və gizlisi düzgündür.",
-    "Please provide a valid Dropbox app key and secret." : "Xahiş olunur düzgün Dropbox proqram açarı və gizlisini təqdim edəsiniz.",
     "Step 1 failed. Exception: %s" : "1-ci addım səhv oldu. İstisna: %s",
     "Step 2 failed. Exception: %s" : "2-ci addım. İstisna: %s",
     "External storage" : "Kənar informasıya daşıyıcısı",
-    "Local" : "Yerli",
-    "Location" : "Yerləşdiyiniz ünvan",
+    "Storage with id \"%i\" not found" : "\"%i\"-li depo tapılmadı",
+    "Invalid mount point" : "Yalnış mount nöqtəsi",
+    "Invalid storage backend \"%s\"" : "Yalnış depo arxasonu \"%s\"",
+    "Personal" : "Şəxsi",
+    "System" : "Sistem",
+    "Grant access" : "Yetkinin verilməsi",
+    "Access granted" : "Yetki verildi",
+    "Generate keys" : "Açarları generasiya et",
+    "Error generating key pair" : "Açar cütlüyünün generasiyası səhvi",
+    "All users. Type to select user or group." : "Sistem istifadəçiləri. Daxil edin ki, istifadəçi və ya qrupu seçəsiniz.",
+    "(group)" : "(qrup)",
+    "Saved" : "Saxlanıldı",
+    "None" : "Heç bir",
+    "App key" : "Proqram açarı",
+    "App secret" : "Proqram sirri",
+    "Client ID" : "Müştəri İD-s",
+    "Client secret" : "Müxtəri sirri",
+    "Username" : "İstifadəçi adı",
+    "Password" : "Şifrə",
+    "Public key" : "İctimai açar",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Açar",
-    "Secret" : "Gizli",
     "Bucket" : "Vedrə",
-    "Amazon S3 and compliant" : "Amazon S3 və uyğun",
-    "Access Key" : "Yetki açarı",
-    "Secret Key" : "Gizli açar",
     "Hostname" : "Sahibadı",
     "Port" : "Port",
     "Region" : "Ərazi",
     "Enable SSL" : "SSL-i işə sal",
     "Enable Path Style" : "Ünvan stilini işə sal",
-    "App key" : "Proqram açarı",
-    "App secret" : "Proqram sirri",
-    "Host" : "Şəbəkədə ünvan",
-    "Username" : "İstifadəçi adı",
-    "Password" : "Şifrə",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Remote subfolder" : "Uzaq altqovluğu",
+    "Secure https://" : "Təhlükəsiz https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Şəbəkədə ünvan",
     "Secure ftps://" : "Təhlükəsiz ftps://",
-    "Client ID" : "Müştəri İD-s",
-    "Client secret" : "Müxtəri sirri",
-    "OpenStack Object Storage" : "OpenStack Obyekt Deposu",
-    "Region (optional for OpenStack Object Storage)" : "Ərazi(İstəkdən asılı olaraq OpenStack Obyekt Deposu üçündür)",
-    "API Key (required for Rackspace Cloud Files)" : "API açar (Rackspace Cloud Fayllar üçün tələb edilir)",
-    "Tenantname (required for OpenStack Object Storage)" : "Kirayəçiadı (OpenStack Obyekt Deposu üçün tələb edilir)",
-    "Password (required for OpenStack Object Storage)" : "Şifrə (OpenStack Obyekt Deposu üçün tələb edilir)",
-    "Service Name (required for OpenStack Object Storage)" : "Servis adi (OpenStack Obyekt Deposu üçün tələb edilir)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Şəxsiyyətin son nöqtəsi URL-i (OpenStack Obyekt Deposu üçün tələb edilir)",
-    "Timeout of HTTP requests in seconds" : "HTTP müraciətlər üçün saniyələrlə olan vaxtın bitməsi",
+    "Local" : "Yerli",
+    "Location" : "Yerləşdiyiniz ünvan",
     "Share" : "Yayımla",
-    "SMB / CIFS using OC login" : "OC login istifadə edir SMB / CIFS",
     "Username as share" : "Paylaşım üçün istifadəçi adı",
-    "URL" : "URL",
-    "Secure https://" : "Təhlükəsiz https://",
-    "Public key" : "İctimai açar",
-    "Storage with id \"%i\" not found" : "\"%i\"-li depo tapılmadı",
-    "Invalid mount point" : "Yalnış mount nöqtəsi",
-    "Invalid storage backend \"%s\"" : "Yalnış depo arxasonu \"%s\"",
-    "Access granted" : "Yetki verildi",
-    "Error configuring Dropbox storage" : "Dropbox deposunun konfiqurasiyasında səhv baş verdi",
-    "Grant access" : "Yetkinin verilməsi",
-    "Error configuring Google Drive storage" : "Google Drive deposunun konfiqində səgv baş verdi",
-    "Personal" : "Şəxsi",
-    "System" : "Sistem",
-    "All users. Type to select user or group." : "Sistem istifadəçiləri. Daxil edin ki, istifadəçi və ya qrupu seçəsiniz.",
-    "(group)" : "(qrup)",
-    "Saved" : "Saxlanıldı",
-    "Generate keys" : "Açarları generasiya et",
-    "Error generating key pair" : "Açar cütlüyünün generasiyası səhvi",
+    "OpenStack Object Storage" : "OpenStack Obyekt Deposu",
     "<b>Note:</b> " : "<b>Qeyd:</b> ",
-    "and" : "və",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Qeyd:</b> PHP-də cURL dəstəyi aktiv deyil və ya yüklənməyib. %s -in birləşdirilməsi mümkün deyil. Xahiş edilir onun yüklənilməsi barəsində inzibatşınıza məlumat verəsiniz.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Qeyd:</b> PHP-də FTP dəstəyi aktiv deyil və ya yüklənməyib. %s -in birləşdirilməsi mümkün deyil. Xahiş edilir onun yüklənilməsi barəsində inzibatşınıza məlumat verəsiniz.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Qeyd:</b> \"%s\" yüklənməyib. %s -in birləşdirilməsi mümkün deyil. Xahiş edilir onun yüklənilməsi barəsində inzibatşınıza məlumat verəsiniz.",
@@ -72,9 +56,9 @@ OC.L10N.register(
     "Folder name" : "Qovluq adı",
     "Configuration" : "Konfiqurasiya",
     "Available for" : "Üçün mövcuddur",
-    "Add storage" : "Deponu əlavə et",
     "Advanced settings" : "İrəliləmiş quraşdırmalar",
     "Delete" : "Sil",
+    "Add storage" : "Deponu əlavə et",
     "Enable User External Storage" : "İstifadəçi kənar deponu aktivləşdir",
     "Allow users to mount the following external storage" : "Göstərilən kənar deponun bərkidilməsi üçün istifadəçilərə izin ver"
 },
diff --git a/apps/files_external/l10n/az.json b/apps/files_external/l10n/az.json
index e0d8727cb20..fa300deea8d 100644
--- a/apps/files_external/l10n/az.json
+++ b/apps/files_external/l10n/az.json
@@ -1,63 +1,47 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Müraciət token-nin alınmasında səhv baş verdi. Əmin olun ki, sizin Dropbox proqraminin açarı və gizlisi düzgündür.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Müraciət token-nin alınmasında səhv baş verdi. Əmin olun ki, sizin Dropbox proqraminin açarı və gizlisi düzgündür.",
-    "Please provide a valid Dropbox app key and secret." : "Xahiş olunur düzgün Dropbox proqram açarı və gizlisini təqdim edəsiniz.",
     "Step 1 failed. Exception: %s" : "1-ci addım səhv oldu. İstisna: %s",
     "Step 2 failed. Exception: %s" : "2-ci addım. İstisna: %s",
     "External storage" : "Kənar informasıya daşıyıcısı",
-    "Local" : "Yerli",
-    "Location" : "Yerləşdiyiniz ünvan",
+    "Storage with id \"%i\" not found" : "\"%i\"-li depo tapılmadı",
+    "Invalid mount point" : "Yalnış mount nöqtəsi",
+    "Invalid storage backend \"%s\"" : "Yalnış depo arxasonu \"%s\"",
+    "Personal" : "Şəxsi",
+    "System" : "Sistem",
+    "Grant access" : "Yetkinin verilməsi",
+    "Access granted" : "Yetki verildi",
+    "Generate keys" : "Açarları generasiya et",
+    "Error generating key pair" : "Açar cütlüyünün generasiyası səhvi",
+    "All users. Type to select user or group." : "Sistem istifadəçiləri. Daxil edin ki, istifadəçi və ya qrupu seçəsiniz.",
+    "(group)" : "(qrup)",
+    "Saved" : "Saxlanıldı",
+    "None" : "Heç bir",
+    "App key" : "Proqram açarı",
+    "App secret" : "Proqram sirri",
+    "Client ID" : "Müştəri İD-s",
+    "Client secret" : "Müxtəri sirri",
+    "Username" : "İstifadəçi adı",
+    "Password" : "Şifrə",
+    "Public key" : "İctimai açar",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Açar",
-    "Secret" : "Gizli",
     "Bucket" : "Vedrə",
-    "Amazon S3 and compliant" : "Amazon S3 və uyğun",
-    "Access Key" : "Yetki açarı",
-    "Secret Key" : "Gizli açar",
     "Hostname" : "Sahibadı",
     "Port" : "Port",
     "Region" : "Ərazi",
     "Enable SSL" : "SSL-i işə sal",
     "Enable Path Style" : "Ünvan stilini işə sal",
-    "App key" : "Proqram açarı",
-    "App secret" : "Proqram sirri",
-    "Host" : "Şəbəkədə ünvan",
-    "Username" : "İstifadəçi adı",
-    "Password" : "Şifrə",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Remote subfolder" : "Uzaq altqovluğu",
+    "Secure https://" : "Təhlükəsiz https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Şəbəkədə ünvan",
     "Secure ftps://" : "Təhlükəsiz ftps://",
-    "Client ID" : "Müştəri İD-s",
-    "Client secret" : "Müxtəri sirri",
-    "OpenStack Object Storage" : "OpenStack Obyekt Deposu",
-    "Region (optional for OpenStack Object Storage)" : "Ərazi(İstəkdən asılı olaraq OpenStack Obyekt Deposu üçündür)",
-    "API Key (required for Rackspace Cloud Files)" : "API açar (Rackspace Cloud Fayllar üçün tələb edilir)",
-    "Tenantname (required for OpenStack Object Storage)" : "Kirayəçiadı (OpenStack Obyekt Deposu üçün tələb edilir)",
-    "Password (required for OpenStack Object Storage)" : "Şifrə (OpenStack Obyekt Deposu üçün tələb edilir)",
-    "Service Name (required for OpenStack Object Storage)" : "Servis adi (OpenStack Obyekt Deposu üçün tələb edilir)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Şəxsiyyətin son nöqtəsi URL-i (OpenStack Obyekt Deposu üçün tələb edilir)",
-    "Timeout of HTTP requests in seconds" : "HTTP müraciətlər üçün saniyələrlə olan vaxtın bitməsi",
+    "Local" : "Yerli",
+    "Location" : "Yerləşdiyiniz ünvan",
     "Share" : "Yayımla",
-    "SMB / CIFS using OC login" : "OC login istifadə edir SMB / CIFS",
     "Username as share" : "Paylaşım üçün istifadəçi adı",
-    "URL" : "URL",
-    "Secure https://" : "Təhlükəsiz https://",
-    "Public key" : "İctimai açar",
-    "Storage with id \"%i\" not found" : "\"%i\"-li depo tapılmadı",
-    "Invalid mount point" : "Yalnış mount nöqtəsi",
-    "Invalid storage backend \"%s\"" : "Yalnış depo arxasonu \"%s\"",
-    "Access granted" : "Yetki verildi",
-    "Error configuring Dropbox storage" : "Dropbox deposunun konfiqurasiyasında səhv baş verdi",
-    "Grant access" : "Yetkinin verilməsi",
-    "Error configuring Google Drive storage" : "Google Drive deposunun konfiqində səgv baş verdi",
-    "Personal" : "Şəxsi",
-    "System" : "Sistem",
-    "All users. Type to select user or group." : "Sistem istifadəçiləri. Daxil edin ki, istifadəçi və ya qrupu seçəsiniz.",
-    "(group)" : "(qrup)",
-    "Saved" : "Saxlanıldı",
-    "Generate keys" : "Açarları generasiya et",
-    "Error generating key pair" : "Açar cütlüyünün generasiyası səhvi",
+    "OpenStack Object Storage" : "OpenStack Obyekt Deposu",
     "<b>Note:</b> " : "<b>Qeyd:</b> ",
-    "and" : "və",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Qeyd:</b> PHP-də cURL dəstəyi aktiv deyil və ya yüklənməyib. %s -in birləşdirilməsi mümkün deyil. Xahiş edilir onun yüklənilməsi barəsində inzibatşınıza məlumat verəsiniz.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Qeyd:</b> PHP-də FTP dəstəyi aktiv deyil və ya yüklənməyib. %s -in birləşdirilməsi mümkün deyil. Xahiş edilir onun yüklənilməsi barəsində inzibatşınıza məlumat verəsiniz.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Qeyd:</b> \"%s\" yüklənməyib. %s -in birləşdirilməsi mümkün deyil. Xahiş edilir onun yüklənilməsi barəsində inzibatşınıza məlumat verəsiniz.",
@@ -70,9 +54,9 @@
     "Folder name" : "Qovluq adı",
     "Configuration" : "Konfiqurasiya",
     "Available for" : "Üçün mövcuddur",
-    "Add storage" : "Deponu əlavə et",
     "Advanced settings" : "İrəliləmiş quraşdırmalar",
     "Delete" : "Sil",
+    "Add storage" : "Deponu əlavə et",
     "Enable User External Storage" : "İstifadəçi kənar deponu aktivləşdir",
     "Allow users to mount the following external storage" : "Göstərilən kənar deponun bərkidilməsi üçün istifadəçilərə izin ver"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/bg_BG.js b/apps/files_external/l10n/bg_BG.js
index 9c29080c0d3..70eae9d1abd 100644
--- a/apps/files_external/l10n/bg_BG.js
+++ b/apps/files_external/l10n/bg_BG.js
@@ -1,64 +1,51 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Неуспешно изтеглянето на токени за заявка. Провери дали Dropbox app key и secret са правилни.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Неуспешно изтеглянето на токени за заявка. Провери дали Dropbox app key и secret са правилни.",
-    "Please provide a valid Dropbox app key and secret." : "Моля, задай валидни Dropbox app key и secret.",
     "Step 1 failed. Exception: %s" : "Стъпка 1 - неуспешна. Грешка: %s",
     "Step 2 failed. Exception: %s" : "Стъпка 2 - неуспешна. Грешка: %s",
     "External storage" : "Външно дисково пространство",
-    "Local" : "Локален",
-    "Location" : "Местоположение",
+    "Storage with id \"%i\" not found" : "Хранилище с име \"%i\" не е намерено",
+    "Invalid mount point" : "Невалиден път за мониторане на файлова система",
+    "Personal" : "Личен",
+    "System" : "Системен",
+    "Grant access" : "Разреши достъп",
+    "Access granted" : "Достъпът разрешен",
+    "Generate keys" : "Генериране на криптографски ключове",
+    "Error generating key pair" : "Грешка при генериране на криптографски ключове",
+    "All users. Type to select user or group." : "Всички потребители. Пиши, за да избереш потребител или група.",
+    "(group)" : "(група)",
+    "Saved" : "Запазено",
+    "None" : "Няма",
+    "App key" : "App key",
+    "App secret" : "App secret",
+    "Client ID" : "Client ID",
+    "Client secret" : "Client secret",
+    "Username" : "Потребителско Име",
+    "Password" : "Парола",
+    "API key" : "API ключ",
+    "Public key" : "Публичен ключ",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Key",
-    "Secret" : "Secret",
     "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 и съвместими",
-    "Access Key" : "Access Key",
-    "Secret Key" : "Secret Key",
     "Hostname" : "Сървър",
     "Port" : "Порт",
     "Region" : "Регион",
     "Enable SSL" : "Включи SSL",
     "Enable Path Style" : "Включи Path Style",
-    "App key" : "App key",
-    "App secret" : "App secret",
-    "Host" : "Сървър",
-    "Username" : "Потребителско Име",
-    "Password" : "Парола",
+    "WebDAV" : "WebDAV",
+    "URL" : "Интернет Адрес",
     "Remote subfolder" : "Външна подпапка",
+    "Secure https://" : "Подсигурен https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Сървър",
     "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 заявки в секунди",
+    "Local" : "Локален",
+    "Location" : "Местоположение",
+    "ownCloud" : "ownCloud",
+    "Root" : "Root",
     "Share" : "Споделяне",
-    "SMB / CIFS using OC login" : "SMB / CIFS използвайки OC профил",
     "Username as share" : "Потребителско име като споделена папка",
-    "URL" : "Интернет Адрес",
-    "Secure https://" : "Подсигурен https://",
-    "Public key" : "Публичен ключ",
-    "Storage with id \"%i\" not found" : "Хранилище с име \"%i\" не е намерено",
-    "Invalid mount point" : "Невалиден път за мониторане на файлова система",
-    "Access granted" : "Достъпът разрешен",
-    "Error configuring Dropbox storage" : "Грешка при настройката на Dropbox дисковото пространство.",
-    "Grant access" : "Разреши достъп",
-    "Error configuring Google Drive storage" : "Грешка при настройката на Dropbox дисковото пространство.",
-    "Personal" : "Личен",
-    "System" : "Системен",
-    "All users. Type to select user or group." : "Всички потребители. Пиши, за да избереш потребител или група.",
-    "(group)" : "(група)",
-    "Saved" : "Запазено",
-    "Generate keys" : "Генериране на криптографски ключове",
-    "Error generating key pair" : "Грешка при генериране на криптографски ключове",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Бележка:</b> ",
-    "and" : "и",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> PHP подръжката на cURL не е включена или инсталирана. Прикачването на %s не е възможно. Моля, поискай системния администратор да я инсталира.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> PHP подръжката на FTP не е включена или инсталирана. Прикачването на %s не е възможно. Моля, поискай системния администратор да я инсталира.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> \"%s\" не е инсталиран. Прикачването на %s не е възможно. Моля, поискай системния администратор да я инсталира.",
@@ -71,9 +58,9 @@ OC.L10N.register(
     "Folder name" : "Име на папката",
     "Configuration" : "Настройки",
     "Available for" : "Достъпно за",
-    "Add storage" : "Добави дисково пространство",
     "Advanced settings" : "Разширени настройки",
     "Delete" : "Изтрий",
+    "Add storage" : "Добави дисково пространство",
     "Enable User External Storage" : "Разреши Потребителско Външно Дисково Пространство",
     "Allow users to mount the following external storage" : "Разреши на потребителите да прикачват следното външно дисково пространство"
 },
diff --git a/apps/files_external/l10n/bg_BG.json b/apps/files_external/l10n/bg_BG.json
index 3ae1ded6966..731897d4a3a 100644
--- a/apps/files_external/l10n/bg_BG.json
+++ b/apps/files_external/l10n/bg_BG.json
@@ -1,62 +1,49 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Неуспешно изтеглянето на токени за заявка. Провери дали Dropbox app key и secret са правилни.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Неуспешно изтеглянето на токени за заявка. Провери дали Dropbox app key и secret са правилни.",
-    "Please provide a valid Dropbox app key and secret." : "Моля, задай валидни Dropbox app key и secret.",
     "Step 1 failed. Exception: %s" : "Стъпка 1 - неуспешна. Грешка: %s",
     "Step 2 failed. Exception: %s" : "Стъпка 2 - неуспешна. Грешка: %s",
     "External storage" : "Външно дисково пространство",
-    "Local" : "Локален",
-    "Location" : "Местоположение",
+    "Storage with id \"%i\" not found" : "Хранилище с име \"%i\" не е намерено",
+    "Invalid mount point" : "Невалиден път за мониторане на файлова система",
+    "Personal" : "Личен",
+    "System" : "Системен",
+    "Grant access" : "Разреши достъп",
+    "Access granted" : "Достъпът разрешен",
+    "Generate keys" : "Генериране на криптографски ключове",
+    "Error generating key pair" : "Грешка при генериране на криптографски ключове",
+    "All users. Type to select user or group." : "Всички потребители. Пиши, за да избереш потребител или група.",
+    "(group)" : "(група)",
+    "Saved" : "Запазено",
+    "None" : "Няма",
+    "App key" : "App key",
+    "App secret" : "App secret",
+    "Client ID" : "Client ID",
+    "Client secret" : "Client secret",
+    "Username" : "Потребителско Име",
+    "Password" : "Парола",
+    "API key" : "API ключ",
+    "Public key" : "Публичен ключ",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Key",
-    "Secret" : "Secret",
     "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 и съвместими",
-    "Access Key" : "Access Key",
-    "Secret Key" : "Secret Key",
     "Hostname" : "Сървър",
     "Port" : "Порт",
     "Region" : "Регион",
     "Enable SSL" : "Включи SSL",
     "Enable Path Style" : "Включи Path Style",
-    "App key" : "App key",
-    "App secret" : "App secret",
-    "Host" : "Сървър",
-    "Username" : "Потребителско Име",
-    "Password" : "Парола",
+    "WebDAV" : "WebDAV",
+    "URL" : "Интернет Адрес",
     "Remote subfolder" : "Външна подпапка",
+    "Secure https://" : "Подсигурен https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Сървър",
     "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 заявки в секунди",
+    "Local" : "Локален",
+    "Location" : "Местоположение",
+    "ownCloud" : "ownCloud",
+    "Root" : "Root",
     "Share" : "Споделяне",
-    "SMB / CIFS using OC login" : "SMB / CIFS използвайки OC профил",
     "Username as share" : "Потребителско име като споделена папка",
-    "URL" : "Интернет Адрес",
-    "Secure https://" : "Подсигурен https://",
-    "Public key" : "Публичен ключ",
-    "Storage with id \"%i\" not found" : "Хранилище с име \"%i\" не е намерено",
-    "Invalid mount point" : "Невалиден път за мониторане на файлова система",
-    "Access granted" : "Достъпът разрешен",
-    "Error configuring Dropbox storage" : "Грешка при настройката на Dropbox дисковото пространство.",
-    "Grant access" : "Разреши достъп",
-    "Error configuring Google Drive storage" : "Грешка при настройката на Dropbox дисковото пространство.",
-    "Personal" : "Личен",
-    "System" : "Системен",
-    "All users. Type to select user or group." : "Всички потребители. Пиши, за да избереш потребител или група.",
-    "(group)" : "(група)",
-    "Saved" : "Запазено",
-    "Generate keys" : "Генериране на криптографски ключове",
-    "Error generating key pair" : "Грешка при генериране на криптографски ключове",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Бележка:</b> ",
-    "and" : "и",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> PHP подръжката на cURL не е включена или инсталирана. Прикачването на %s не е възможно. Моля, поискай системния администратор да я инсталира.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> PHP подръжката на FTP не е включена или инсталирана. Прикачването на %s не е възможно. Моля, поискай системния администратор да я инсталира.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> \"%s\" не е инсталиран. Прикачването на %s не е възможно. Моля, поискай системния администратор да я инсталира.",
@@ -69,9 +56,9 @@
     "Folder name" : "Име на папката",
     "Configuration" : "Настройки",
     "Available for" : "Достъпно за",
-    "Add storage" : "Добави дисково пространство",
     "Advanced settings" : "Разширени настройки",
     "Delete" : "Изтрий",
+    "Add storage" : "Добави дисково пространство",
     "Enable User External Storage" : "Разреши Потребителско Външно Дисково Пространство",
     "Allow users to mount the following external storage" : "Разреши на потребителите да прикачват следното външно дисково пространство"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/bn_BD.js b/apps/files_external/l10n/bn_BD.js
index 79df8f58bf3..3676a1a8b51 100644
--- a/apps/files_external/l10n/bn_BD.js
+++ b/apps/files_external/l10n/bn_BD.js
@@ -1,36 +1,34 @@
 OC.L10N.register(
     "files_external",
     {
-    "Please provide a valid Dropbox app key and secret." : "দয়া করে সঠিক এবং বৈধ Dropbox app key and secret প্রদান করুন।",
     "Step 1 failed. Exception: %s" : "প্রথম ধাপ ব্যার্থ। ব্যতিক্রম: %s",
     "External storage" : "বাহ্যিক সংরক্ষণাগার",
-    "Local" : "স্থানীয়",
-    "Location" : "অবস্থান",
+    "Personal" : "ব্যক্তিগত",
+    "Grant access" : "অধিগমনের  অনুমতি প্রদান কর",
+    "Access granted" : "অধিগমনের  অনুমতি প্রদান করা হলো",
+    "(group)" : "(গোষ্ঠি)",
+    "Saved" : "সংরক্ষণ করা হলো",
+    "None" : "কোনটিই নয়",
+    "App key" : "অ্যাপ কি",
+    "App secret" : "অ্যাপ সিক্রেট",
+    "Client ID" : "ক্লায়েন্ট পরিচিতি",
+    "Username" : "ব্যবহারকারী",
+    "Password" : "কূটশব্দ",
     "Amazon S3" : "আমাজন S3",
-    "Key" : "কী",
-    "Secret" : "গোপণীয়",
     "Bucket" : "বালতি",
-    "Secret Key" : "গোপণ চাবি",
     "Hostname" : "হোস্টনেম",
     "Port" : "পোর্ট",
     "Region" : "এলাকা",
     "Enable SSL" : "SSL সক্রিয় কর",
-    "App key" : "অ্যাপ কি",
-    "App secret" : "অ্যাপ সিক্রেট",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Host" : "হোস্ট",
-    "Username" : "ব্যবহারকারী",
-    "Password" : "কূটশব্দ",
     "Secure ftps://" : "ftps:// অর্জন কর",
-    "Client ID" : "ক্লায়েন্ট পরিচিতি",
+    "Local" : "স্থানীয়",
+    "Location" : "অবস্থান",
+    "ownCloud" : "ওউনক্লাউড",
+    "Root" : "শেকড়",
     "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> ",
     "Name" : "রাম",
     "External Storage" : "বাহ্যিক সংরক্ষণাগার",
diff --git a/apps/files_external/l10n/bn_BD.json b/apps/files_external/l10n/bn_BD.json
index 74da3dd1af3..5b7d07da5a2 100644
--- a/apps/files_external/l10n/bn_BD.json
+++ b/apps/files_external/l10n/bn_BD.json
@@ -1,34 +1,32 @@
 { "translations": {
-    "Please provide a valid Dropbox app key and secret." : "দয়া করে সঠিক এবং বৈধ Dropbox app key and secret প্রদান করুন।",
     "Step 1 failed. Exception: %s" : "প্রথম ধাপ ব্যার্থ। ব্যতিক্রম: %s",
     "External storage" : "বাহ্যিক সংরক্ষণাগার",
-    "Local" : "স্থানীয়",
-    "Location" : "অবস্থান",
+    "Personal" : "ব্যক্তিগত",
+    "Grant access" : "অধিগমনের  অনুমতি প্রদান কর",
+    "Access granted" : "অধিগমনের  অনুমতি প্রদান করা হলো",
+    "(group)" : "(গোষ্ঠি)",
+    "Saved" : "সংরক্ষণ করা হলো",
+    "None" : "কোনটিই নয়",
+    "App key" : "অ্যাপ কি",
+    "App secret" : "অ্যাপ সিক্রেট",
+    "Client ID" : "ক্লায়েন্ট পরিচিতি",
+    "Username" : "ব্যবহারকারী",
+    "Password" : "কূটশব্দ",
     "Amazon S3" : "আমাজন S3",
-    "Key" : "কী",
-    "Secret" : "গোপণীয়",
     "Bucket" : "বালতি",
-    "Secret Key" : "গোপণ চাবি",
     "Hostname" : "হোস্টনেম",
     "Port" : "পোর্ট",
     "Region" : "এলাকা",
     "Enable SSL" : "SSL সক্রিয় কর",
-    "App key" : "অ্যাপ কি",
-    "App secret" : "অ্যাপ সিক্রেট",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Host" : "হোস্ট",
-    "Username" : "ব্যবহারকারী",
-    "Password" : "কূটশব্দ",
     "Secure ftps://" : "ftps:// অর্জন কর",
-    "Client ID" : "ক্লায়েন্ট পরিচিতি",
+    "Local" : "স্থানীয়",
+    "Location" : "অবস্থান",
+    "ownCloud" : "ওউনক্লাউড",
+    "Root" : "শেকড়",
     "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> ",
     "Name" : "রাম",
     "External Storage" : "বাহ্যিক সংরক্ষণাগার",
diff --git a/apps/files_external/l10n/bn_IN.js b/apps/files_external/l10n/bn_IN.js
index cd66c82ab84..31f903204aa 100644
--- a/apps/files_external/l10n/bn_IN.js
+++ b/apps/files_external/l10n/bn_IN.js
@@ -1,11 +1,11 @@
 OC.L10N.register(
     "files_external",
     {
-    "Host" : "হোস্ট",
+    "Saved" : "সংরক্ষিত",
     "Username" : "ইউজারনেম",
-    "Share" : "শেয়ার",
     "URL" : "URL",
-    "Saved" : "সংরক্ষিত",
+    "Host" : "হোস্ট",
+    "Share" : "শেয়ার",
     "Name" : "নাম",
     "Folder name" : "ফোল্ডারের নাম",
     "Delete" : "মুছে ফেলা"
diff --git a/apps/files_external/l10n/bn_IN.json b/apps/files_external/l10n/bn_IN.json
index ca30788dbc4..be89b6f43ea 100644
--- a/apps/files_external/l10n/bn_IN.json
+++ b/apps/files_external/l10n/bn_IN.json
@@ -1,9 +1,9 @@
 { "translations": {
-    "Host" : "হোস্ট",
+    "Saved" : "সংরক্ষিত",
     "Username" : "ইউজারনেম",
-    "Share" : "শেয়ার",
     "URL" : "URL",
-    "Saved" : "সংরক্ষিত",
+    "Host" : "হোস্ট",
+    "Share" : "শেয়ার",
     "Name" : "নাম",
     "Folder name" : "ফোল্ডারের নাম",
     "Delete" : "মুছে ফেলা"
diff --git a/apps/files_external/l10n/bs.js b/apps/files_external/l10n/bs.js
index b71d1832e51..2cd3cf47509 100644
--- a/apps/files_external/l10n/bs.js
+++ b/apps/files_external/l10n/bs.js
@@ -1,14 +1,17 @@
 OC.L10N.register(
     "files_external",
     {
-    "Local" : "Lokalno",
-    "Location" : "Lokacija",
-    "Port" : "Priključak",
+    "Personal" : "Osobno",
+    "Saved" : "Spremljeno",
+    "None" : "Ništa",
     "Username" : "Korisničko ime",
     "Password" : "Lozinka",
+    "Port" : "Priključak",
+    "WebDAV" : "WebDAV",
+    "Local" : "Lokalno",
+    "Location" : "Lokacija",
+    "ownCloud" : "OwnCloud",
     "Share" : "Podijeli",
-    "Personal" : "Osobno",
-    "Saved" : "Spremljeno",
     "Name" : "Ime",
     "Delete" : "Izbriši"
 },
diff --git a/apps/files_external/l10n/bs.json b/apps/files_external/l10n/bs.json
index 36141be81e4..e2d76555f08 100644
--- a/apps/files_external/l10n/bs.json
+++ b/apps/files_external/l10n/bs.json
@@ -1,12 +1,15 @@
 { "translations": {
-    "Local" : "Lokalno",
-    "Location" : "Lokacija",
-    "Port" : "Priključak",
+    "Personal" : "Osobno",
+    "Saved" : "Spremljeno",
+    "None" : "Ništa",
     "Username" : "Korisničko ime",
     "Password" : "Lozinka",
+    "Port" : "Priključak",
+    "WebDAV" : "WebDAV",
+    "Local" : "Lokalno",
+    "Location" : "Lokacija",
+    "ownCloud" : "OwnCloud",
     "Share" : "Podijeli",
-    "Personal" : "Osobno",
-    "Saved" : "Spremljeno",
     "Name" : "Ime",
     "Delete" : "Izbriši"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
diff --git a/apps/files_external/l10n/ca.js b/apps/files_external/l10n/ca.js
index b3ccb76ccdb..9c10f6d5c50 100644
--- a/apps/files_external/l10n/ca.js
+++ b/apps/files_external/l10n/ca.js
@@ -1,59 +1,18 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Ha fallat en obtenir els testimonis de la petició. Verifiqueu que la clau i la contrasenya de l'aplicació Dropbox són correctes.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Ha fallat en obtenir els testimonis de la petició. Verifiqueu que la clau i la contrasenya de l'aplicació Dropbox són correctes.",
-    "Please provide a valid Dropbox app key and secret." : "Proporcioneu una clau d'aplicació i secret vàlids per a Dropbox",
     "Step 1 failed. Exception: %s" : "El pas 1 ha fallat. Excepció: %s",
     "Step 2 failed. Exception: %s" : "El pas 2 ha fallat. Excepció: %s",
     "External storage" : "Emmagatzemament extern",
-    "Local" : "Local",
-    "Location" : "Ubicació",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Clau",
-    "Secret" : "Secret",
-    "Bucket" : "Cub",
-    "Amazon S3 and compliant" : "Amazon S3 i similars",
-    "Access Key" : "Clau d'accés",
-    "Secret Key" : "Clau secreta",
-    "Hostname" : "Nom del servidor",
-    "Port" : "Port",
-    "Region" : "Comarca",
-    "Enable SSL" : "Habilita SSL",
-    "Enable Path Style" : "Permet l'estil del camí",
-    "App key" : "Clau de l'aplicació",
-    "App secret" : "Secret de l'aplicació",
-    "Host" : "Equip remot",
-    "Username" : "Nom d'usuari",
-    "Password" : "Contrasenya",
-    "Remote subfolder" : "Subcarpeta remota",
-    "Secure ftps://" : "Protocol segur ftps://",
-    "Client ID" : "Client ID",
-    "Client secret" : "Secret del client",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Regió (opcional per OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Clau API (requerit per fitxers al núvol Rackspace)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (requerit per OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Contrasenya (requerit per OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nom del servei (requerit per OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL del punt identificador final (requerit per OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Temps d'expera màxim de les peticions HTTP en segons",
-    "Share" : "Comparteix",
-    "SMB / CIFS using OC login" : "SMB / CIFS usant acreditació OC",
-    "Username as share" : "Nom d'usuari per compartir",
-    "URL" : "URL",
-    "Secure https://" : "Protocol segur https://",
-    "SFTP with secret key login" : "Inici de sessió SFTP amb clau secreta",
-    "Public key" : "Clau pública",
     "Storage with id \"%i\" not found" : "No s'ha trobat emmagatzematge amb id \"%i\"",
     "Invalid mount point" : "Punt de muntatge no vàlid",
     "Invalid storage backend \"%s\"" : "Motor d'emmagatzematge no vàlid \"%s\"",
-    "Access granted" : "S'ha concedit l'accés",
-    "Error configuring Dropbox storage" : "Error en configurar l'emmagatzemament Dropbox",
-    "Grant access" : "Concedeix accés",
-    "Error configuring Google Drive storage" : "Error en configurar l'emmagatzemament Google Drive",
     "Personal" : "Personal",
     "System" : "Sistema",
+    "Grant access" : "Concedeix accés",
+    "Access granted" : "S'ha concedit l'accés",
+    "Generate keys" : "Generar claus",
+    "Error generating key pair" : "Error en generar el parell de claus",
     "Enable encryption" : "Habilitar xifrat",
     "Enable previews" : "Habilitar vistes prèvies",
     "Check for changes" : "Comproveu si hi ha canvis",
@@ -63,10 +22,36 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Tots els usuaris. Escriu per seleccionar un usuari o grup.",
     "(group)" : "(grup)",
     "Saved" : "Desat",
-    "Generate keys" : "Generar claus",
-    "Error generating key pair" : "Error en generar el parell de claus",
+    "None" : "Cap",
+    "App key" : "Clau de l'aplicació",
+    "App secret" : "Secret de l'aplicació",
+    "Client ID" : "Client ID",
+    "Client secret" : "Secret del client",
+    "Username" : "Nom d'usuari",
+    "Password" : "Contrasenya",
+    "API key" : "codi API",
+    "Public key" : "Clau pública",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Cub",
+    "Hostname" : "Nom del servidor",
+    "Port" : "Port",
+    "Region" : "Comarca",
+    "Enable SSL" : "Habilita SSL",
+    "Enable Path Style" : "Permet l'estil del camí",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Subcarpeta remota",
+    "Secure https://" : "Protocol segur https://",
+    "Host" : "Equip remot",
+    "Secure ftps://" : "Protocol segur ftps://",
+    "Local" : "Local",
+    "Location" : "Ubicació",
+    "ownCloud" : "ownCloud",
+    "Root" : "Arrel",
+    "Share" : "Comparteix",
+    "Username as share" : "Nom d'usuari per compartir",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Nota:</b> ",
-    "and" : "i",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El suport cURL no està activat o instal·lat a PHP. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El suport FTP per PHP no està activat o no està instal·lat. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> %s no està instal·lat. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li.",
@@ -79,9 +64,9 @@ OC.L10N.register(
     "Folder name" : "Nom de la carpeta",
     "Configuration" : "Configuració",
     "Available for" : "Disponible per",
-    "Add storage" : "Afegeix emmagatzemament",
     "Advanced settings" : "Configuració avançada",
     "Delete" : "Esborra",
+    "Add storage" : "Afegeix emmagatzemament",
     "Enable User External Storage" : "Habilita l'emmagatzemament extern d'usuari",
     "Allow users to mount the following external storage" : "Permet als usuaris muntar els dispositius externs següents"
 },
diff --git a/apps/files_external/l10n/ca.json b/apps/files_external/l10n/ca.json
index 6295ed8df3d..123527688c4 100644
--- a/apps/files_external/l10n/ca.json
+++ b/apps/files_external/l10n/ca.json
@@ -1,57 +1,16 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Ha fallat en obtenir els testimonis de la petició. Verifiqueu que la clau i la contrasenya de l'aplicació Dropbox són correctes.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Ha fallat en obtenir els testimonis de la petició. Verifiqueu que la clau i la contrasenya de l'aplicació Dropbox són correctes.",
-    "Please provide a valid Dropbox app key and secret." : "Proporcioneu una clau d'aplicació i secret vàlids per a Dropbox",
     "Step 1 failed. Exception: %s" : "El pas 1 ha fallat. Excepció: %s",
     "Step 2 failed. Exception: %s" : "El pas 2 ha fallat. Excepció: %s",
     "External storage" : "Emmagatzemament extern",
-    "Local" : "Local",
-    "Location" : "Ubicació",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Clau",
-    "Secret" : "Secret",
-    "Bucket" : "Cub",
-    "Amazon S3 and compliant" : "Amazon S3 i similars",
-    "Access Key" : "Clau d'accés",
-    "Secret Key" : "Clau secreta",
-    "Hostname" : "Nom del servidor",
-    "Port" : "Port",
-    "Region" : "Comarca",
-    "Enable SSL" : "Habilita SSL",
-    "Enable Path Style" : "Permet l'estil del camí",
-    "App key" : "Clau de l'aplicació",
-    "App secret" : "Secret de l'aplicació",
-    "Host" : "Equip remot",
-    "Username" : "Nom d'usuari",
-    "Password" : "Contrasenya",
-    "Remote subfolder" : "Subcarpeta remota",
-    "Secure ftps://" : "Protocol segur ftps://",
-    "Client ID" : "Client ID",
-    "Client secret" : "Secret del client",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Regió (opcional per OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Clau API (requerit per fitxers al núvol Rackspace)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (requerit per OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Contrasenya (requerit per OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nom del servei (requerit per OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL del punt identificador final (requerit per OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Temps d'expera màxim de les peticions HTTP en segons",
-    "Share" : "Comparteix",
-    "SMB / CIFS using OC login" : "SMB / CIFS usant acreditació OC",
-    "Username as share" : "Nom d'usuari per compartir",
-    "URL" : "URL",
-    "Secure https://" : "Protocol segur https://",
-    "SFTP with secret key login" : "Inici de sessió SFTP amb clau secreta",
-    "Public key" : "Clau pública",
     "Storage with id \"%i\" not found" : "No s'ha trobat emmagatzematge amb id \"%i\"",
     "Invalid mount point" : "Punt de muntatge no vàlid",
     "Invalid storage backend \"%s\"" : "Motor d'emmagatzematge no vàlid \"%s\"",
-    "Access granted" : "S'ha concedit l'accés",
-    "Error configuring Dropbox storage" : "Error en configurar l'emmagatzemament Dropbox",
-    "Grant access" : "Concedeix accés",
-    "Error configuring Google Drive storage" : "Error en configurar l'emmagatzemament Google Drive",
     "Personal" : "Personal",
     "System" : "Sistema",
+    "Grant access" : "Concedeix accés",
+    "Access granted" : "S'ha concedit l'accés",
+    "Generate keys" : "Generar claus",
+    "Error generating key pair" : "Error en generar el parell de claus",
     "Enable encryption" : "Habilitar xifrat",
     "Enable previews" : "Habilitar vistes prèvies",
     "Check for changes" : "Comproveu si hi ha canvis",
@@ -61,10 +20,36 @@
     "All users. Type to select user or group." : "Tots els usuaris. Escriu per seleccionar un usuari o grup.",
     "(group)" : "(grup)",
     "Saved" : "Desat",
-    "Generate keys" : "Generar claus",
-    "Error generating key pair" : "Error en generar el parell de claus",
+    "None" : "Cap",
+    "App key" : "Clau de l'aplicació",
+    "App secret" : "Secret de l'aplicació",
+    "Client ID" : "Client ID",
+    "Client secret" : "Secret del client",
+    "Username" : "Nom d'usuari",
+    "Password" : "Contrasenya",
+    "API key" : "codi API",
+    "Public key" : "Clau pública",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Cub",
+    "Hostname" : "Nom del servidor",
+    "Port" : "Port",
+    "Region" : "Comarca",
+    "Enable SSL" : "Habilita SSL",
+    "Enable Path Style" : "Permet l'estil del camí",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Subcarpeta remota",
+    "Secure https://" : "Protocol segur https://",
+    "Host" : "Equip remot",
+    "Secure ftps://" : "Protocol segur ftps://",
+    "Local" : "Local",
+    "Location" : "Ubicació",
+    "ownCloud" : "ownCloud",
+    "Root" : "Arrel",
+    "Share" : "Comparteix",
+    "Username as share" : "Nom d'usuari per compartir",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Nota:</b> ",
-    "and" : "i",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El suport cURL no està activat o instal·lat a PHP. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El suport FTP per PHP no està activat o no està instal·lat. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> %s no està instal·lat. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li.",
@@ -77,9 +62,9 @@
     "Folder name" : "Nom de la carpeta",
     "Configuration" : "Configuració",
     "Available for" : "Disponible per",
-    "Add storage" : "Afegeix emmagatzemament",
     "Advanced settings" : "Configuració avançada",
     "Delete" : "Esborra",
+    "Add storage" : "Afegeix emmagatzemament",
     "Enable User External Storage" : "Habilita l'emmagatzemament extern d'usuari",
     "Allow users to mount the following external storage" : "Permet als usuaris muntar els dispositius externs següents"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/cs_CZ.js b/apps/files_external/l10n/cs_CZ.js
index 4698dd915ac..503d00893e9 100644
--- a/apps/files_external/l10n/cs_CZ.js
+++ b/apps/files_external/l10n/cs_CZ.js
@@ -1,59 +1,24 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Získání přístupových tokenů selhalo. Ověřte že klíč aplikace Dropbox a tajné heslo jsou správné.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Získání přístupových tokenů selhalo. Ověřte že klíč aplikace Dropbox a tajné heslo jsou správné.",
-    "Please provide a valid Dropbox app key and secret." : "Zadejte, prosím, platný klíč a bezpečnostní frázi aplikace Dropbox.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Získání přístupových tokenů selhalo. Ověřte že klíč aplikace a tajné heslo jsou správné.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Získání přístupových tokenů selhalo. Ověřte že klíč aplikace a tajné heslo jsou správné.",
+    "Please provide a valid app key and secret." : "Zadejte prosím platný klíč a tajné heslo aplikace.",
     "Step 1 failed. Exception: %s" : "Selhal krok 1. Výjimka: %s",
     "Step 2 failed. Exception: %s" : "Selhal krok 2. Výjimka: %s",
     "External storage" : "Externí úložiště",
-    "Local" : "Místní",
-    "Location" : "Umístění",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Klíč",
-    "Secret" : "Tajemství",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 a kompatibilní",
-    "Access Key" : "Přístupový klíč",
-    "Secret Key" : "Tajný klíč",
-    "Hostname" : "Hostname",
-    "Port" : "Port",
-    "Region" : "Kraj",
-    "Enable SSL" : "Povolit SSL",
-    "Enable Path Style" : "Povolit Path Style",
-    "App key" : "Klíč aplikace",
-    "App secret" : "Tajemství aplikace",
-    "Host" : "Počítač",
-    "Username" : "Uživatelské jméno",
-    "Password" : "Heslo",
-    "Remote subfolder" : "Vzdálený podadresář",
-    "Secure ftps://" : "Zabezpečené ftps://",
-    "Client ID" : "Klientské ID",
-    "Client secret" : "Klientské tajemství",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Region (nepovinný pro OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API klíč (vyžadován pro Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Jméno nájemce (vyžadováno pro OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Heslo (vyžadováno pro OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Název služby (vyžadováno pro OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL identity koncového bodu (vyžadováno pro OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Časový limit HTTP požadavků v sekundách",
-    "Share" : "Sdílet",
-    "SMB / CIFS using OC login" : "SMB / CIFS za použití přihlašovacího jména OC",
-    "Username as share" : "Uživatelské jméno jako sdílený adresář",
-    "URL" : "URL",
-    "Secure https://" : "Zabezpečené https://",
-    "SFTP with secret key login" : "SFTP login s tajným klíčem",
-    "Public key" : "Veřejný klíč",
     "Storage with id \"%i\" not found" : "Úložiště s id \"%i\" nebylo nalezeno",
+    "Invalid backend or authentication mechanism class" : "Neplatný backend nebo třída ověřovacího mechanismu",
     "Invalid mount point" : "Neplatný přípojný bod",
     "Invalid storage backend \"%s\"" : "Neplatná služba úložiště \"%s\"",
-    "Access granted" : "Přístup povolen",
-    "Error configuring Dropbox storage" : "Chyba při nastavení úložiště Dropbox",
-    "Grant access" : "Povolit přístup",
-    "Error configuring Google Drive storage" : "Chyba při nastavení úložiště Google Drive",
     "Personal" : "Osobní",
     "System" : "Systém",
+    "Grant access" : "Povolit přístup",
+    "Access granted" : "Přístup povolen",
+    "Error configuring OAuth1" : "Chyba nastavení OAuth1",
+    "Error configuring OAuth2" : "Chyba nastavení OAuth2",
+    "Generate keys" : "Vytvořit klíče",
+    "Error generating key pair" : "Chyba při vytváření páru klíčů",
     "Enable encryption" : "Povolit šifrování",
     "Enable previews" : "Povolit náhledy",
     "Check for changes" : "Zkontrolovat změny",
@@ -63,10 +28,49 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Všichni uživatelé. Začněte psát pro výběr uživatelů a skupin.",
     "(group)" : "(skupina)",
     "Saved" : "Uloženo",
-    "Generate keys" : "Vytvořit klíče",
-    "Error generating key pair" : "Chyba při vytváření páru klíčů",
+    "Access key" : "Přístupový klíč",
+    "Secret key" : "Tajný klíč",
+    "None" : "Žádné",
+    "OAuth1" : "OAuth1",
+    "App key" : "Klíč aplikace",
+    "App secret" : "Tajemství aplikace",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "Klientské ID",
+    "Client secret" : "Klientské tajemství",
+    "OpenStack" : "OpenStack",
+    "Username" : "Uživatelské jméno",
+    "Password" : "Heslo",
+    "API key" : "Klíč API",
+    "Username and password" : "Uživatelské jméno a heslo",
+    "Session credentials" : "Přihlašovací údaje sezení",
+    "RSA public key" : "RSA veřejný klíč",
+    "Public key" : "Veřejný klíč",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Hostname",
+    "Port" : "Port",
+    "Region" : "Kraj",
+    "Enable SSL" : "Povolit SSL",
+    "Enable Path Style" : "Povolit Path Style",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Vzdálený podadresář",
+    "Secure https://" : "Zabezpečené https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Počítač",
+    "Secure ftps://" : "Zabezpečené ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Místní",
+    "Location" : "Umístění",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Kořen",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Sdílet",
+    "Username as share" : "Uživatelské jméno jako sdílený adresář",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Poznámka:</b>",
-    "and" : "a",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> cURL podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> FTP podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> \"%s\" není instalováno. Není možné připojení %s. Prosím požádejte svého správce systému o instalaci.",
@@ -77,11 +81,12 @@ OC.L10N.register(
     "Scope" : "Rozsah",
     "External Storage" : "Externí úložiště",
     "Folder name" : "Název složky",
+    "Authentication" : "Ověření",
     "Configuration" : "Nastavení",
     "Available for" : "Dostupné pro",
-    "Add storage" : "Přidat úložiště",
     "Advanced settings" : "Pokročilá nastavení",
     "Delete" : "Smazat",
+    "Add storage" : "Přidat úložiště",
     "Enable User External Storage" : "Zapnout externí uživatelské úložiště",
     "Allow users to mount the following external storage" : "Povolit uživatelů připojit následující externí úložiště"
 },
diff --git a/apps/files_external/l10n/cs_CZ.json b/apps/files_external/l10n/cs_CZ.json
index 53b2162dafe..74aa6cc82e3 100644
--- a/apps/files_external/l10n/cs_CZ.json
+++ b/apps/files_external/l10n/cs_CZ.json
@@ -1,57 +1,22 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Získání přístupových tokenů selhalo. Ověřte že klíč aplikace Dropbox a tajné heslo jsou správné.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Získání přístupových tokenů selhalo. Ověřte že klíč aplikace Dropbox a tajné heslo jsou správné.",
-    "Please provide a valid Dropbox app key and secret." : "Zadejte, prosím, platný klíč a bezpečnostní frázi aplikace Dropbox.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Získání přístupových tokenů selhalo. Ověřte že klíč aplikace a tajné heslo jsou správné.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Získání přístupových tokenů selhalo. Ověřte že klíč aplikace a tajné heslo jsou správné.",
+    "Please provide a valid app key and secret." : "Zadejte prosím platný klíč a tajné heslo aplikace.",
     "Step 1 failed. Exception: %s" : "Selhal krok 1. Výjimka: %s",
     "Step 2 failed. Exception: %s" : "Selhal krok 2. Výjimka: %s",
     "External storage" : "Externí úložiště",
-    "Local" : "Místní",
-    "Location" : "Umístění",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Klíč",
-    "Secret" : "Tajemství",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 a kompatibilní",
-    "Access Key" : "Přístupový klíč",
-    "Secret Key" : "Tajný klíč",
-    "Hostname" : "Hostname",
-    "Port" : "Port",
-    "Region" : "Kraj",
-    "Enable SSL" : "Povolit SSL",
-    "Enable Path Style" : "Povolit Path Style",
-    "App key" : "Klíč aplikace",
-    "App secret" : "Tajemství aplikace",
-    "Host" : "Počítač",
-    "Username" : "Uživatelské jméno",
-    "Password" : "Heslo",
-    "Remote subfolder" : "Vzdálený podadresář",
-    "Secure ftps://" : "Zabezpečené ftps://",
-    "Client ID" : "Klientské ID",
-    "Client secret" : "Klientské tajemství",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Region (nepovinný pro OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API klíč (vyžadován pro Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Jméno nájemce (vyžadováno pro OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Heslo (vyžadováno pro OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Název služby (vyžadováno pro OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL identity koncového bodu (vyžadováno pro OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Časový limit HTTP požadavků v sekundách",
-    "Share" : "Sdílet",
-    "SMB / CIFS using OC login" : "SMB / CIFS za použití přihlašovacího jména OC",
-    "Username as share" : "Uživatelské jméno jako sdílený adresář",
-    "URL" : "URL",
-    "Secure https://" : "Zabezpečené https://",
-    "SFTP with secret key login" : "SFTP login s tajným klíčem",
-    "Public key" : "Veřejný klíč",
     "Storage with id \"%i\" not found" : "Úložiště s id \"%i\" nebylo nalezeno",
+    "Invalid backend or authentication mechanism class" : "Neplatný backend nebo třída ověřovacího mechanismu",
     "Invalid mount point" : "Neplatný přípojný bod",
     "Invalid storage backend \"%s\"" : "Neplatná služba úložiště \"%s\"",
-    "Access granted" : "Přístup povolen",
-    "Error configuring Dropbox storage" : "Chyba při nastavení úložiště Dropbox",
-    "Grant access" : "Povolit přístup",
-    "Error configuring Google Drive storage" : "Chyba při nastavení úložiště Google Drive",
     "Personal" : "Osobní",
     "System" : "Systém",
+    "Grant access" : "Povolit přístup",
+    "Access granted" : "Přístup povolen",
+    "Error configuring OAuth1" : "Chyba nastavení OAuth1",
+    "Error configuring OAuth2" : "Chyba nastavení OAuth2",
+    "Generate keys" : "Vytvořit klíče",
+    "Error generating key pair" : "Chyba při vytváření páru klíčů",
     "Enable encryption" : "Povolit šifrování",
     "Enable previews" : "Povolit náhledy",
     "Check for changes" : "Zkontrolovat změny",
@@ -61,10 +26,49 @@
     "All users. Type to select user or group." : "Všichni uživatelé. Začněte psát pro výběr uživatelů a skupin.",
     "(group)" : "(skupina)",
     "Saved" : "Uloženo",
-    "Generate keys" : "Vytvořit klíče",
-    "Error generating key pair" : "Chyba při vytváření páru klíčů",
+    "Access key" : "Přístupový klíč",
+    "Secret key" : "Tajný klíč",
+    "None" : "Žádné",
+    "OAuth1" : "OAuth1",
+    "App key" : "Klíč aplikace",
+    "App secret" : "Tajemství aplikace",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "Klientské ID",
+    "Client secret" : "Klientské tajemství",
+    "OpenStack" : "OpenStack",
+    "Username" : "Uživatelské jméno",
+    "Password" : "Heslo",
+    "API key" : "Klíč API",
+    "Username and password" : "Uživatelské jméno a heslo",
+    "Session credentials" : "Přihlašovací údaje sezení",
+    "RSA public key" : "RSA veřejný klíč",
+    "Public key" : "Veřejný klíč",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Hostname",
+    "Port" : "Port",
+    "Region" : "Kraj",
+    "Enable SSL" : "Povolit SSL",
+    "Enable Path Style" : "Povolit Path Style",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Vzdálený podadresář",
+    "Secure https://" : "Zabezpečené https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Počítač",
+    "Secure ftps://" : "Zabezpečené ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Místní",
+    "Location" : "Umístění",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Kořen",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Sdílet",
+    "Username as share" : "Uživatelské jméno jako sdílený adresář",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Poznámka:</b>",
-    "and" : "a",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> cURL podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> FTP podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> \"%s\" není instalováno. Není možné připojení %s. Prosím požádejte svého správce systému o instalaci.",
@@ -75,11 +79,12 @@
     "Scope" : "Rozsah",
     "External Storage" : "Externí úložiště",
     "Folder name" : "Název složky",
+    "Authentication" : "Ověření",
     "Configuration" : "Nastavení",
     "Available for" : "Dostupné pro",
-    "Add storage" : "Přidat úložiště",
     "Advanced settings" : "Pokročilá nastavení",
     "Delete" : "Smazat",
+    "Add storage" : "Přidat úložiště",
     "Enable User External Storage" : "Zapnout externí uživatelské úložiště",
     "Allow users to mount the following external storage" : "Povolit uživatelů připojit následující externí úložiště"
 },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
diff --git a/apps/files_external/l10n/cy_GB.js b/apps/files_external/l10n/cy_GB.js
index 4cd0a336e90..4364445be0c 100644
--- a/apps/files_external/l10n/cy_GB.js
+++ b/apps/files_external/l10n/cy_GB.js
@@ -1,12 +1,14 @@
 OC.L10N.register(
     "files_external",
     {
-    "Location" : "Lleoliad",
+    "Personal" : "Personol",
+    "None" : "Dim",
     "Username" : "Enw defnyddiwr",
     "Password" : "Cyfrinair",
-    "Share" : "Rhannu",
     "URL" : "URL",
-    "Personal" : "Personol",
+    "Location" : "Lleoliad",
+    "ownCloud" : "ownCloud",
+    "Share" : "Rhannu",
     "Name" : "Enw",
     "Delete" : "Dileu"
 },
diff --git a/apps/files_external/l10n/cy_GB.json b/apps/files_external/l10n/cy_GB.json
index 257039de583..4916cb270ab 100644
--- a/apps/files_external/l10n/cy_GB.json
+++ b/apps/files_external/l10n/cy_GB.json
@@ -1,10 +1,12 @@
 { "translations": {
-    "Location" : "Lleoliad",
+    "Personal" : "Personol",
+    "None" : "Dim",
     "Username" : "Enw defnyddiwr",
     "Password" : "Cyfrinair",
-    "Share" : "Rhannu",
     "URL" : "URL",
-    "Personal" : "Personol",
+    "Location" : "Lleoliad",
+    "ownCloud" : "ownCloud",
+    "Share" : "Rhannu",
     "Name" : "Enw",
     "Delete" : "Dileu"
 },"pluralForm" :"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;"
diff --git a/apps/files_external/l10n/da.js b/apps/files_external/l10n/da.js
index bafebbbf879..b1f058efbb3 100644
--- a/apps/files_external/l10n/da.js
+++ b/apps/files_external/l10n/da.js
@@ -1,59 +1,27 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Indhentning af symboludtryk for forespørgsler mislykkedes. Verificér at din Dropbox app-nøgle og -hemmelighed er korrekte.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Indhentning af symboludtryk for adgang mislykkedes. Verificér at din Dropbox app-nøgle og -hemmelighed er korrekte.",
-    "Please provide a valid Dropbox app key and secret." : "Angiv venligst en gyldig Dropbox app-nøgle og hemmelighed",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Tokener til anmodning om hentning mislykkedes. Verificér at dine app-nøgle og -hemmelighed er korrekte.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Tokener for adgang til hentning fejlede. Verificér at dine app-nøgle og -hemmelighed er korrekte.",
+    "Please provide a valid app key and secret." : "Angiv venligst gyldig app-nøgle og -hemmelighed.",
     "Step 1 failed. Exception: %s" : "Trin 1 mislykkedes. Undtagelse: %s",
     "Step 2 failed. Exception: %s" : "Trin 2 mislykkedes. Undtagelse: %s",
     "External storage" : "Eksternt lager",
-    "Local" : "Lokal",
-    "Location" : "Placering",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Nøgle",
-    "Secret" : "Hemmelighed",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 og kompatible",
-    "Access Key" : "Adgangsnøgle",
-    "Secret Key" : "Hemmelig nøgle ",
-    "Hostname" : "Værtsnavn",
-    "Port" : "Port",
-    "Region" : "Region",
-    "Enable SSL" : "Aktivér SSL",
-    "Enable Path Style" : "Aktivér stil for sti",
-    "App key" : "App-nøgle",
-    "App secret" : "App-hemmelighed",
-    "Host" : "Vært",
-    "Username" : "Brugernavn",
-    "Password" : "Kodeord",
-    "Remote subfolder" : "Fjernundermappe",
-    "Secure ftps://" : "Sikker ftps://",
-    "Client ID" : "Klient-ID",
-    "Client secret" : "Klient hemmelighed",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Region (valgfri for OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API-nøgle (påkrævet for Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Lejers navn (påkrævet for OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Adgangskode (påkrævet for OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Service Navn (påkrævet for OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL på slutpunkt for identitet (påkrævet for OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Tidsudløb for HTTP-forespørgsler i sekunder",
-    "Share" : "Del",
-    "SMB / CIFS using OC login" : "SMB / CIFS med OC-login",
-    "Username as share" : "Brugernavn som deling",
-    "URL" : "URL",
-    "Secure https://" : "Sikker https://",
-    "SFTP with secret key login" : "SFTP med hemmelig nøglelogin",
-    "Public key" : "Offentlig nøgle",
     "Storage with id \"%i\" not found" : "Lager med ID'et \"%i% er ikke fundet",
+    "Invalid backend or authentication mechanism class" : "Ugyldig backend eller klasse for godkendelsesmekanisme",
     "Invalid mount point" : "Fokert monteringspunkt",
+    "Objectstore forbidden" : "Objectstore er forbudt",
     "Invalid storage backend \"%s\"" : "Forkert lager til backend \"%s\"en",
-    "Access granted" : "Adgang godkendt",
-    "Error configuring Dropbox storage" : "Fejl ved konfiguration af Dropbox plads",
-    "Grant access" : "Godkend adgang",
-    "Error configuring Google Drive storage" : "Fejl ved konfiguration af Google Drive-plads",
+    "Unsatisfied backend parameters" : "Utilfredsstillede backend-parametre",
+    "Unsatisfied authentication mechanism parameters" : "Utilfredsstillede parametre for godkendelsesmekanisme",
     "Personal" : "Personligt",
     "System" : "System",
+    "Grant access" : "Godkend adgang",
+    "Access granted" : "Adgang godkendt",
+    "Error configuring OAuth1" : "Fejl under konfiguration af OAuth1",
+    "Error configuring OAuth2" : "Fejl under konfiguration af OAuth2",
+    "Generate keys" : "Opret nøgler.",
+    "Error generating key pair" : "Fejl under oprettelse af nøglepar",
     "Enable encryption" : "Slå kryptering til",
     "Enable previews" : "Slå forhåndsvisninger til",
     "Check for changes" : "Tjek for ændringer",
@@ -63,10 +31,48 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Alle brugere. Indtast for at vælge bruger eller gruppe.",
     "(group)" : "(gruppe)",
     "Saved" : "Gemt",
-    "Generate keys" : "Opret nøgler.",
-    "Error generating key pair" : "Fejl under oprettelse af nøglepar",
+    "Access key" : "Adgangsnøgle",
+    "Secret key" : "Hemmelig nøgle",
+    "Builtin" : "Indbygget",
+    "None" : "Ingen",
+    "OAuth1" : "OAuth1",
+    "App key" : "App-nøgle",
+    "App secret" : "App-hemmelighed",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "Klient-ID",
+    "Client secret" : "Klient hemmelighed",
+    "Username" : "Brugernavn",
+    "Password" : "Kodeord",
+    "API key" : "API nøgle",
+    "Username and password" : "Brugernavn og kodeord",
+    "Session credentials" : "Brugeroplysninger for session",
+    "Public key" : "Offentlig nøgle",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Værtsnavn",
+    "Port" : "Port",
+    "Region" : "Region",
+    "Enable SSL" : "Aktivér SSL",
+    "Enable Path Style" : "Aktivér stil for sti",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Fjernundermappe",
+    "Secure https://" : "Sikker https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Vært",
+    "Secure ftps://" : "Sikker ftps://",
+    "Google Drive" : "Google Drev",
+    "Local" : "Lokal",
+    "Location" : "Placering",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Root",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Del",
+    "Username as share" : "Brugernavn som deling",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Note:</b> ",
-    "and" : "og",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Bemærk:</b>  cURL-understøttelsen i PHP er enten ikke aktiveret eller installeret. Monteringen af %s er ikke mulig. Anmod din systemadministrator om at installere det.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Bemærk:</b>  FTP understøttelsen i PHP er enten ikke aktiveret eller installeret. Montering af %s er ikke muligt. Anmod din systemadministrator om at installere det.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Bemærk:</b>  \"%s\" er ikke installeret. Monteringen af %s er ikke mulig. Anmod din systemadministrator om at installere det.",
@@ -77,11 +83,12 @@ OC.L10N.register(
     "Scope" : "Anvendelsesområde",
     "External Storage" : "Ekstern opbevaring",
     "Folder name" : "Mappenavn",
+    "Authentication" : "Godkendelse",
     "Configuration" : "Opsætning",
     "Available for" : "Tilgængelig for",
-    "Add storage" : "Tilføj lager",
     "Advanced settings" : "Avancerede indstillinger",
     "Delete" : "Slet",
+    "Add storage" : "Tilføj lager",
     "Enable User External Storage" : "Aktivér ekstern opbevaring for brugere",
     "Allow users to mount the following external storage" : "Tillad brugere at montere følgende som eksternt lager"
 },
diff --git a/apps/files_external/l10n/da.json b/apps/files_external/l10n/da.json
index 663cf93b6ff..811de509421 100644
--- a/apps/files_external/l10n/da.json
+++ b/apps/files_external/l10n/da.json
@@ -1,57 +1,25 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Indhentning af symboludtryk for forespørgsler mislykkedes. Verificér at din Dropbox app-nøgle og -hemmelighed er korrekte.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Indhentning af symboludtryk for adgang mislykkedes. Verificér at din Dropbox app-nøgle og -hemmelighed er korrekte.",
-    "Please provide a valid Dropbox app key and secret." : "Angiv venligst en gyldig Dropbox app-nøgle og hemmelighed",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Tokener til anmodning om hentning mislykkedes. Verificér at dine app-nøgle og -hemmelighed er korrekte.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Tokener for adgang til hentning fejlede. Verificér at dine app-nøgle og -hemmelighed er korrekte.",
+    "Please provide a valid app key and secret." : "Angiv venligst gyldig app-nøgle og -hemmelighed.",
     "Step 1 failed. Exception: %s" : "Trin 1 mislykkedes. Undtagelse: %s",
     "Step 2 failed. Exception: %s" : "Trin 2 mislykkedes. Undtagelse: %s",
     "External storage" : "Eksternt lager",
-    "Local" : "Lokal",
-    "Location" : "Placering",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Nøgle",
-    "Secret" : "Hemmelighed",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 og kompatible",
-    "Access Key" : "Adgangsnøgle",
-    "Secret Key" : "Hemmelig nøgle ",
-    "Hostname" : "Værtsnavn",
-    "Port" : "Port",
-    "Region" : "Region",
-    "Enable SSL" : "Aktivér SSL",
-    "Enable Path Style" : "Aktivér stil for sti",
-    "App key" : "App-nøgle",
-    "App secret" : "App-hemmelighed",
-    "Host" : "Vært",
-    "Username" : "Brugernavn",
-    "Password" : "Kodeord",
-    "Remote subfolder" : "Fjernundermappe",
-    "Secure ftps://" : "Sikker ftps://",
-    "Client ID" : "Klient-ID",
-    "Client secret" : "Klient hemmelighed",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Region (valgfri for OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API-nøgle (påkrævet for Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Lejers navn (påkrævet for OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Adgangskode (påkrævet for OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Service Navn (påkrævet for OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL på slutpunkt for identitet (påkrævet for OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Tidsudløb for HTTP-forespørgsler i sekunder",
-    "Share" : "Del",
-    "SMB / CIFS using OC login" : "SMB / CIFS med OC-login",
-    "Username as share" : "Brugernavn som deling",
-    "URL" : "URL",
-    "Secure https://" : "Sikker https://",
-    "SFTP with secret key login" : "SFTP med hemmelig nøglelogin",
-    "Public key" : "Offentlig nøgle",
     "Storage with id \"%i\" not found" : "Lager med ID'et \"%i% er ikke fundet",
+    "Invalid backend or authentication mechanism class" : "Ugyldig backend eller klasse for godkendelsesmekanisme",
     "Invalid mount point" : "Fokert monteringspunkt",
+    "Objectstore forbidden" : "Objectstore er forbudt",
     "Invalid storage backend \"%s\"" : "Forkert lager til backend \"%s\"en",
-    "Access granted" : "Adgang godkendt",
-    "Error configuring Dropbox storage" : "Fejl ved konfiguration af Dropbox plads",
-    "Grant access" : "Godkend adgang",
-    "Error configuring Google Drive storage" : "Fejl ved konfiguration af Google Drive-plads",
+    "Unsatisfied backend parameters" : "Utilfredsstillede backend-parametre",
+    "Unsatisfied authentication mechanism parameters" : "Utilfredsstillede parametre for godkendelsesmekanisme",
     "Personal" : "Personligt",
     "System" : "System",
+    "Grant access" : "Godkend adgang",
+    "Access granted" : "Adgang godkendt",
+    "Error configuring OAuth1" : "Fejl under konfiguration af OAuth1",
+    "Error configuring OAuth2" : "Fejl under konfiguration af OAuth2",
+    "Generate keys" : "Opret nøgler.",
+    "Error generating key pair" : "Fejl under oprettelse af nøglepar",
     "Enable encryption" : "Slå kryptering til",
     "Enable previews" : "Slå forhåndsvisninger til",
     "Check for changes" : "Tjek for ændringer",
@@ -61,10 +29,48 @@
     "All users. Type to select user or group." : "Alle brugere. Indtast for at vælge bruger eller gruppe.",
     "(group)" : "(gruppe)",
     "Saved" : "Gemt",
-    "Generate keys" : "Opret nøgler.",
-    "Error generating key pair" : "Fejl under oprettelse af nøglepar",
+    "Access key" : "Adgangsnøgle",
+    "Secret key" : "Hemmelig nøgle",
+    "Builtin" : "Indbygget",
+    "None" : "Ingen",
+    "OAuth1" : "OAuth1",
+    "App key" : "App-nøgle",
+    "App secret" : "App-hemmelighed",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "Klient-ID",
+    "Client secret" : "Klient hemmelighed",
+    "Username" : "Brugernavn",
+    "Password" : "Kodeord",
+    "API key" : "API nøgle",
+    "Username and password" : "Brugernavn og kodeord",
+    "Session credentials" : "Brugeroplysninger for session",
+    "Public key" : "Offentlig nøgle",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Værtsnavn",
+    "Port" : "Port",
+    "Region" : "Region",
+    "Enable SSL" : "Aktivér SSL",
+    "Enable Path Style" : "Aktivér stil for sti",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Fjernundermappe",
+    "Secure https://" : "Sikker https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Vært",
+    "Secure ftps://" : "Sikker ftps://",
+    "Google Drive" : "Google Drev",
+    "Local" : "Lokal",
+    "Location" : "Placering",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Root",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Del",
+    "Username as share" : "Brugernavn som deling",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Note:</b> ",
-    "and" : "og",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Bemærk:</b>  cURL-understøttelsen i PHP er enten ikke aktiveret eller installeret. Monteringen af %s er ikke mulig. Anmod din systemadministrator om at installere det.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Bemærk:</b>  FTP understøttelsen i PHP er enten ikke aktiveret eller installeret. Montering af %s er ikke muligt. Anmod din systemadministrator om at installere det.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Bemærk:</b>  \"%s\" er ikke installeret. Monteringen af %s er ikke mulig. Anmod din systemadministrator om at installere det.",
@@ -75,11 +81,12 @@
     "Scope" : "Anvendelsesområde",
     "External Storage" : "Ekstern opbevaring",
     "Folder name" : "Mappenavn",
+    "Authentication" : "Godkendelse",
     "Configuration" : "Opsætning",
     "Available for" : "Tilgængelig for",
-    "Add storage" : "Tilføj lager",
     "Advanced settings" : "Avancerede indstillinger",
     "Delete" : "Slet",
+    "Add storage" : "Tilføj lager",
     "Enable User External Storage" : "Aktivér ekstern opbevaring for brugere",
     "Allow users to mount the following external storage" : "Tillad brugere at montere følgende som eksternt lager"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/de.js b/apps/files_external/l10n/de.js
index 31f4dc7923f..fc0af67d3d7 100644
--- a/apps/files_external/l10n/de.js
+++ b/apps/files_external/l10n/de.js
@@ -1,59 +1,18 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Abrufen des Anfrage-Tokens fehlgeschlagen. Stelle bitte sicher, dass der Anwendungsschlüssel und Sicherheitsschlüssel für Dropbox korrekt sind.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Abrufen des Zugriff-Tokens fehlgeschlagen. Stelle bitte sicher, dass der Anwendungsschlüssel und Sicherheitsschlüssel für Dropbox korrekt sind.",
-    "Please provide a valid Dropbox app key and secret." : "Bitte trage einen gültigen Dropbox-App-Key mit Secret ein.",
     "Step 1 failed. Exception: %s" : "Schritt 1 fehlgeschlagen. Fehlermeldung: %s",
     "Step 2 failed. Exception: %s" : "Schritt 2 fehlgeschlagen. Fehlermeldung: %s",
     "External storage" : "Externer Speicher",
-    "Local" : "Lokal",
-    "Location" : "Ort",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Schlüssel",
-    "Secret" : "Geheime Zeichenkette",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 und kompatible",
-    "Access Key" : "Zugriffsschlüssel",
-    "Secret Key" : "Sicherheitssschlüssel",
-    "Hostname" : "Host-Name",
-    "Port" : "Port",
-    "Region" : "Region",
-    "Enable SSL" : "SSL aktivieren",
-    "Enable Path Style" : "Pfad-Stil aktivieren",
-    "App key" : "App-Schlüssel",
-    "App secret" : "Geheime Zeichenkette der App",
-    "Host" : "Host",
-    "Username" : "Benutzername",
-    "Password" : "Passwort",
-    "Remote subfolder" : "Entfernter Unterordner",
-    "Secure ftps://" : "Sicherer ftps://",
-    "Client ID" : "Client-ID",
-    "Client secret" : "Geheime Zeichenkette des Client",
-    "OpenStack Object Storage" : "Openstack-Objektspeicher",
-    "Region (optional for OpenStack Object Storage)" : "Region (Optional für Openstack-Objektspeicher)",
-    "API Key (required for Rackspace Cloud Files)" : "API-Schlüssel (Erforderlich für Rackspace Cloud-Dateien)",
-    "Tenantname (required for OpenStack Object Storage)" : "Mietername (Erforderlich für Openstack-Objektspeicher)",
-    "Password (required for OpenStack Object Storage)" : "Passwort (Erforderlich für Openstack-Objektspeicher)",
-    "Service Name (required for OpenStack Object Storage)" : "Name der Dienstleistung (Erforderlich für Openstack-Objektspeicher)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL des Identitätsendpunktes (Erforderlich für Openstack-Objektspeicher)",
-    "Timeout of HTTP requests in seconds" : "Zeitüberschreitung von HTTP-Anfragen in Sekunden",
-    "Share" : "Share",
-    "SMB / CIFS using OC login" : "SMB / CIFS mit OC-Login",
-    "Username as share" : "Benutzername als Freigabe",
-    "URL" : "URL",
-    "Secure https://" : "Sicherer HTTPS://",
-    "SFTP with secret key login" : "SFTP mit dem Login über einen geheimen Schlüssel",
-    "Public key" : "Öffentlicher Schlüssel",
     "Storage with id \"%i\" not found" : "Der Speicher mit der ID „%i“ wurde nicht gefunden",
     "Invalid mount point" : "Ungültiger mount point",
     "Invalid storage backend \"%s\"" : "Ungültiges Speicher-Backend „%s“",
-    "Access granted" : "Zugriff gestattet",
-    "Error configuring Dropbox storage" : "Fehler beim Einrichten von Dropbox",
-    "Grant access" : "Zugriff gestatten",
-    "Error configuring Google Drive storage" : "Fehler beim Einrichten von Google Drive",
     "Personal" : "Persönlich",
     "System" : "System",
+    "Grant access" : "Zugriff gestatten",
+    "Access granted" : "Zugriff gestattet",
+    "Generate keys" : "Schlüssel erzeugen",
+    "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares",
     "Enable encryption" : "Verschlüsselung aktivieren",
     "Enable previews" : "Vorschau aktivieren",
     "Check for changes" : "Auf Änderungen überprüfen",
@@ -63,10 +22,37 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.",
     "(group)" : "(group)",
     "Saved" : "Gespeichert",
-    "Generate keys" : "Schlüssel erzeugen",
-    "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares",
+    "None" : "Keine",
+    "App key" : "App-Schlüssel",
+    "App secret" : "Geheime Zeichenkette der App",
+    "Client ID" : "Client-ID",
+    "Client secret" : "Geheime Zeichenkette des Client",
+    "Username" : "Benutzername",
+    "Password" : "Passwort",
+    "API key" : "API-Schlüssel",
+    "Public key" : "Öffentlicher Schlüssel",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Host-Name",
+    "Port" : "Port",
+    "Region" : "Region",
+    "Enable SSL" : "SSL aktivieren",
+    "Enable Path Style" : "Pfad-Stil aktivieren",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Entfernter Unterordner",
+    "Secure https://" : "Sicherer HTTPS://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Host",
+    "Secure ftps://" : "Sicherer ftps://",
+    "Local" : "Lokal",
+    "Location" : "Ort",
+    "ownCloud" : "ownCloud",
+    "Root" : "Root",
+    "Share" : "Share",
+    "Username as share" : "Benutzername als Freigabe",
+    "OpenStack Object Storage" : "Openstack-Objektspeicher",
     "<b>Note:</b> " : "<b>Hinweis:</b> ",
-    "and" : "und",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die cURL-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich zur Installation an Deinen Systemadministrator.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich sich zur Installation an Deinen Systemadministrator.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> \"%s\" ist nicht installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich sich zur Installation an Deinen Systemadministrator.",
@@ -79,9 +65,9 @@ OC.L10N.register(
     "Folder name" : "Ordnername",
     "Configuration" : "Konfiguration",
     "Available for" : "Verfügbar für",
-    "Add storage" : "Speicher hinzufügen",
     "Advanced settings" : "Erweiterte Einstellungen",
     "Delete" : "Löschen",
+    "Add storage" : "Speicher hinzufügen",
     "Enable User External Storage" : "Externen Speicher für Benutzer aktivieren",
     "Allow users to mount the following external storage" : "Erlaube es Benutzern, den folgenden externen Speicher einzubinden"
 },
diff --git a/apps/files_external/l10n/de.json b/apps/files_external/l10n/de.json
index ef96c6e84a8..4242b817073 100644
--- a/apps/files_external/l10n/de.json
+++ b/apps/files_external/l10n/de.json
@@ -1,57 +1,16 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Abrufen des Anfrage-Tokens fehlgeschlagen. Stelle bitte sicher, dass der Anwendungsschlüssel und Sicherheitsschlüssel für Dropbox korrekt sind.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Abrufen des Zugriff-Tokens fehlgeschlagen. Stelle bitte sicher, dass der Anwendungsschlüssel und Sicherheitsschlüssel für Dropbox korrekt sind.",
-    "Please provide a valid Dropbox app key and secret." : "Bitte trage einen gültigen Dropbox-App-Key mit Secret ein.",
     "Step 1 failed. Exception: %s" : "Schritt 1 fehlgeschlagen. Fehlermeldung: %s",
     "Step 2 failed. Exception: %s" : "Schritt 2 fehlgeschlagen. Fehlermeldung: %s",
     "External storage" : "Externer Speicher",
-    "Local" : "Lokal",
-    "Location" : "Ort",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Schlüssel",
-    "Secret" : "Geheime Zeichenkette",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 und kompatible",
-    "Access Key" : "Zugriffsschlüssel",
-    "Secret Key" : "Sicherheitssschlüssel",
-    "Hostname" : "Host-Name",
-    "Port" : "Port",
-    "Region" : "Region",
-    "Enable SSL" : "SSL aktivieren",
-    "Enable Path Style" : "Pfad-Stil aktivieren",
-    "App key" : "App-Schlüssel",
-    "App secret" : "Geheime Zeichenkette der App",
-    "Host" : "Host",
-    "Username" : "Benutzername",
-    "Password" : "Passwort",
-    "Remote subfolder" : "Entfernter Unterordner",
-    "Secure ftps://" : "Sicherer ftps://",
-    "Client ID" : "Client-ID",
-    "Client secret" : "Geheime Zeichenkette des Client",
-    "OpenStack Object Storage" : "Openstack-Objektspeicher",
-    "Region (optional for OpenStack Object Storage)" : "Region (Optional für Openstack-Objektspeicher)",
-    "API Key (required for Rackspace Cloud Files)" : "API-Schlüssel (Erforderlich für Rackspace Cloud-Dateien)",
-    "Tenantname (required for OpenStack Object Storage)" : "Mietername (Erforderlich für Openstack-Objektspeicher)",
-    "Password (required for OpenStack Object Storage)" : "Passwort (Erforderlich für Openstack-Objektspeicher)",
-    "Service Name (required for OpenStack Object Storage)" : "Name der Dienstleistung (Erforderlich für Openstack-Objektspeicher)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL des Identitätsendpunktes (Erforderlich für Openstack-Objektspeicher)",
-    "Timeout of HTTP requests in seconds" : "Zeitüberschreitung von HTTP-Anfragen in Sekunden",
-    "Share" : "Share",
-    "SMB / CIFS using OC login" : "SMB / CIFS mit OC-Login",
-    "Username as share" : "Benutzername als Freigabe",
-    "URL" : "URL",
-    "Secure https://" : "Sicherer HTTPS://",
-    "SFTP with secret key login" : "SFTP mit dem Login über einen geheimen Schlüssel",
-    "Public key" : "Öffentlicher Schlüssel",
     "Storage with id \"%i\" not found" : "Der Speicher mit der ID „%i“ wurde nicht gefunden",
     "Invalid mount point" : "Ungültiger mount point",
     "Invalid storage backend \"%s\"" : "Ungültiges Speicher-Backend „%s“",
-    "Access granted" : "Zugriff gestattet",
-    "Error configuring Dropbox storage" : "Fehler beim Einrichten von Dropbox",
-    "Grant access" : "Zugriff gestatten",
-    "Error configuring Google Drive storage" : "Fehler beim Einrichten von Google Drive",
     "Personal" : "Persönlich",
     "System" : "System",
+    "Grant access" : "Zugriff gestatten",
+    "Access granted" : "Zugriff gestattet",
+    "Generate keys" : "Schlüssel erzeugen",
+    "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares",
     "Enable encryption" : "Verschlüsselung aktivieren",
     "Enable previews" : "Vorschau aktivieren",
     "Check for changes" : "Auf Änderungen überprüfen",
@@ -61,10 +20,37 @@
     "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.",
     "(group)" : "(group)",
     "Saved" : "Gespeichert",
-    "Generate keys" : "Schlüssel erzeugen",
-    "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares",
+    "None" : "Keine",
+    "App key" : "App-Schlüssel",
+    "App secret" : "Geheime Zeichenkette der App",
+    "Client ID" : "Client-ID",
+    "Client secret" : "Geheime Zeichenkette des Client",
+    "Username" : "Benutzername",
+    "Password" : "Passwort",
+    "API key" : "API-Schlüssel",
+    "Public key" : "Öffentlicher Schlüssel",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Host-Name",
+    "Port" : "Port",
+    "Region" : "Region",
+    "Enable SSL" : "SSL aktivieren",
+    "Enable Path Style" : "Pfad-Stil aktivieren",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Entfernter Unterordner",
+    "Secure https://" : "Sicherer HTTPS://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Host",
+    "Secure ftps://" : "Sicherer ftps://",
+    "Local" : "Lokal",
+    "Location" : "Ort",
+    "ownCloud" : "ownCloud",
+    "Root" : "Root",
+    "Share" : "Share",
+    "Username as share" : "Benutzername als Freigabe",
+    "OpenStack Object Storage" : "Openstack-Objektspeicher",
     "<b>Note:</b> " : "<b>Hinweis:</b> ",
-    "and" : "und",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die cURL-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich zur Installation an Deinen Systemadministrator.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich sich zur Installation an Deinen Systemadministrator.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> \"%s\" ist nicht installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich sich zur Installation an Deinen Systemadministrator.",
@@ -77,9 +63,9 @@
     "Folder name" : "Ordnername",
     "Configuration" : "Konfiguration",
     "Available for" : "Verfügbar für",
-    "Add storage" : "Speicher hinzufügen",
     "Advanced settings" : "Erweiterte Einstellungen",
     "Delete" : "Löschen",
+    "Add storage" : "Speicher hinzufügen",
     "Enable User External Storage" : "Externen Speicher für Benutzer aktivieren",
     "Allow users to mount the following external storage" : "Erlaube es Benutzern, den folgenden externen Speicher einzubinden"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/de_AT.js b/apps/files_external/l10n/de_AT.js
index 5dbc69e2966..6c71c45f217 100644
--- a/apps/files_external/l10n/de_AT.js
+++ b/apps/files_external/l10n/de_AT.js
@@ -1,13 +1,13 @@
 OC.L10N.register(
     "files_external",
     {
-    "Location" : "Ort",
-    "Port" : "Port",
-    "Host" : "Host",
+    "Personal" : "Persönlich",
     "Username" : "Benutzername",
     "Password" : "Passwort",
+    "Port" : "Port",
+    "Host" : "Host",
+    "Location" : "Ort",
     "Share" : "Freigeben",
-    "Personal" : "Persönlich",
     "Folder name" : "Ordner Name",
     "Delete" : "Löschen"
 },
diff --git a/apps/files_external/l10n/de_AT.json b/apps/files_external/l10n/de_AT.json
index 7fd1d456c58..0d956dc81c6 100644
--- a/apps/files_external/l10n/de_AT.json
+++ b/apps/files_external/l10n/de_AT.json
@@ -1,11 +1,11 @@
 { "translations": {
-    "Location" : "Ort",
-    "Port" : "Port",
-    "Host" : "Host",
+    "Personal" : "Persönlich",
     "Username" : "Benutzername",
     "Password" : "Passwort",
+    "Port" : "Port",
+    "Host" : "Host",
+    "Location" : "Ort",
     "Share" : "Freigeben",
-    "Personal" : "Persönlich",
     "Folder name" : "Ordner Name",
     "Delete" : "Löschen"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/de_CH.js b/apps/files_external/l10n/de_CH.js
deleted file mode 100644
index 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/de_DE.js b/apps/files_external/l10n/de_DE.js
index 0f9fac23553..9d363aecbf6 100644
--- a/apps/files_external/l10n/de_DE.js
+++ b/apps/files_external/l10n/de_DE.js
@@ -1,59 +1,18 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Abrufen des Anfrage-Tokens fehlgeschlagen. Stellen Sie sicher, dass der Anwendungsschlüssel und Sicherheitsschlüssel für Dropbox korrekt sind.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Abrufen des Zugriff-Tokens fehlgeschlagen. Stellen Sie sicher, dass der Anwendungsschlüssel und Sicherheitsschlüssel für Dropbox korrekt sind.",
-    "Please provide a valid Dropbox app key and secret." : "Bitte tragen Sie einen gültigen Dropbox-App-Key mit Secret ein.",
     "Step 1 failed. Exception: %s" : "Schritt 1 fehlgeschlagen. Fehlermeldung: %s",
     "Step 2 failed. Exception: %s" : "Schritt 2 fehlgeschlagen. Fehlermeldung: %s",
     "External storage" : "Externer Speicher",
-    "Local" : "Lokal",
-    "Location" : "Ort",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Schlüssel",
-    "Secret" : "Geheime Zeichenkette",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 und Kompatible",
-    "Access Key" : "Zugriffsschlüssel",
-    "Secret Key" : "Sicherheitsschlüssel",
-    "Hostname" : "Host-Name",
-    "Port" : "Port",
-    "Region" : "Region",
-    "Enable SSL" : "SSL aktivieren",
-    "Enable Path Style" : "Pfadstil aktivieren",
-    "App key" : "App-Schlüssel",
-    "App secret" : "Geheime Zeichenkette der App",
-    "Host" : "Host",
-    "Username" : "Benutzername",
-    "Password" : "Passwort",
-    "Remote subfolder" : "Entfernter Unterordner",
-    "Secure ftps://" : "Sicheres ftps://",
-    "Client ID" : "Client-ID",
-    "Client secret" : "Geheime Zeichenkette des Client",
-    "OpenStack Object Storage" : "Openstack-Objektspeicher",
-    "Region (optional for OpenStack Object Storage)" : "Region (Optional für Openstack-Objektspeicher)",
-    "API Key (required for Rackspace Cloud Files)" : "API-Schlüssel (Erforderlich für Rackspace Cloud-Dateien)",
-    "Tenantname (required for OpenStack Object Storage)" : "Mietername (Erforderlich für Openstack-Objektspeicher)",
-    "Password (required for OpenStack Object Storage)" : "Passwort (Erforderlich für Openstack-Objektspeicher)",
-    "Service Name (required for OpenStack Object Storage)" : "Name der Dienstleistung (Erforderlich für Openstack-Objektspeicher)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL des Identitätsendpunktes (Erforderlich für Openstack-Objektspeicher)",
-    "Timeout of HTTP requests in seconds" : "Zeitüberschreitung von HTTP-Anfragen in Sekunden",
-    "Share" : "Share",
-    "SMB / CIFS using OC login" : "SMB / CIFS mit OC-Login",
-    "Username as share" : "Benutzername als Freigabe",
-    "URL" : "Adresse",
-    "Secure https://" : "Sicheres https://",
-    "SFTP with secret key login" : "SFTP mit dem Login über einen geheimen Schlüssel",
-    "Public key" : "Öffentlicher Schlüssel",
     "Storage with id \"%i\" not found" : "Der Speicher mit der ID „%i“ wurde nicht gefunden",
     "Invalid mount point" : "Ungültiger mount point",
     "Invalid storage backend \"%s\"" : "Ungültiges Speicher-Backend „%s“",
-    "Access granted" : "Zugriff gestattet",
-    "Error configuring Dropbox storage" : "Fehler beim Einrichten von Dropbox",
-    "Grant access" : "Zugriff gestatten",
-    "Error configuring Google Drive storage" : "Fehler beim Einrichten von Google Drive",
     "Personal" : "Persönlich",
     "System" : "System",
+    "Grant access" : "Zugriff gestatten",
+    "Access granted" : "Zugriff gestattet",
+    "Generate keys" : "Schlüssel erzeugen",
+    "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares",
     "Enable encryption" : "Verschlüsselung aktivieren",
     "Enable previews" : "Vorschau aktivieren",
     "Check for changes" : "Auf Änderungen überprüfen",
@@ -63,10 +22,37 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.",
     "(group)" : "(group)",
     "Saved" : "Gespeichert",
-    "Generate keys" : "Schlüssel erzeugen",
-    "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares",
+    "None" : "Keine",
+    "App key" : "App-Schlüssel",
+    "App secret" : "Geheime Zeichenkette der App",
+    "Client ID" : "Client-ID",
+    "Client secret" : "Geheime Zeichenkette des Client",
+    "Username" : "Benutzername",
+    "Password" : "Passwort",
+    "API key" : "API-Schlüssel",
+    "Public key" : "Öffentlicher Schlüssel",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Host-Name",
+    "Port" : "Port",
+    "Region" : "Region",
+    "Enable SSL" : "SSL aktivieren",
+    "Enable Path Style" : "Pfadstil aktivieren",
+    "WebDAV" : "WebDAV",
+    "URL" : "Adresse",
+    "Remote subfolder" : "Entfernter Unterordner",
+    "Secure https://" : "Sicheres https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Host",
+    "Secure ftps://" : "Sicheres ftps://",
+    "Local" : "Lokal",
+    "Location" : "Ort",
+    "ownCloud" : "ownCloud",
+    "Root" : "Root",
+    "Share" : "Share",
+    "Username as share" : "Benutzername als Freigabe",
+    "OpenStack Object Storage" : "Openstack-Objektspeicher",
     "<b>Note:</b> " : "<b>Hinweis:</b> ",
-    "and" : "und",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die cURL-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> \"%s\" ist nicht installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.",
@@ -79,9 +65,9 @@ OC.L10N.register(
     "Folder name" : "Ordnername",
     "Configuration" : "Konfiguration",
     "Available for" : "Verfügbar für",
-    "Add storage" : "Speicher hinzufügen",
     "Advanced settings" : "Erweiterte Einstellungen",
     "Delete" : "Löschen",
+    "Add storage" : "Speicher hinzufügen",
     "Enable User External Storage" : "Externen Speicher für Benutzer aktivieren",
     "Allow users to mount the following external storage" : "Erlauben Sie Benutzern, folgende externe Speicher einzubinden"
 },
diff --git a/apps/files_external/l10n/de_DE.json b/apps/files_external/l10n/de_DE.json
index ad137e56751..62fe7b0803c 100644
--- a/apps/files_external/l10n/de_DE.json
+++ b/apps/files_external/l10n/de_DE.json
@@ -1,57 +1,16 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Abrufen des Anfrage-Tokens fehlgeschlagen. Stellen Sie sicher, dass der Anwendungsschlüssel und Sicherheitsschlüssel für Dropbox korrekt sind.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Abrufen des Zugriff-Tokens fehlgeschlagen. Stellen Sie sicher, dass der Anwendungsschlüssel und Sicherheitsschlüssel für Dropbox korrekt sind.",
-    "Please provide a valid Dropbox app key and secret." : "Bitte tragen Sie einen gültigen Dropbox-App-Key mit Secret ein.",
     "Step 1 failed. Exception: %s" : "Schritt 1 fehlgeschlagen. Fehlermeldung: %s",
     "Step 2 failed. Exception: %s" : "Schritt 2 fehlgeschlagen. Fehlermeldung: %s",
     "External storage" : "Externer Speicher",
-    "Local" : "Lokal",
-    "Location" : "Ort",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Schlüssel",
-    "Secret" : "Geheime Zeichenkette",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 und Kompatible",
-    "Access Key" : "Zugriffsschlüssel",
-    "Secret Key" : "Sicherheitsschlüssel",
-    "Hostname" : "Host-Name",
-    "Port" : "Port",
-    "Region" : "Region",
-    "Enable SSL" : "SSL aktivieren",
-    "Enable Path Style" : "Pfadstil aktivieren",
-    "App key" : "App-Schlüssel",
-    "App secret" : "Geheime Zeichenkette der App",
-    "Host" : "Host",
-    "Username" : "Benutzername",
-    "Password" : "Passwort",
-    "Remote subfolder" : "Entfernter Unterordner",
-    "Secure ftps://" : "Sicheres ftps://",
-    "Client ID" : "Client-ID",
-    "Client secret" : "Geheime Zeichenkette des Client",
-    "OpenStack Object Storage" : "Openstack-Objektspeicher",
-    "Region (optional for OpenStack Object Storage)" : "Region (Optional für Openstack-Objektspeicher)",
-    "API Key (required for Rackspace Cloud Files)" : "API-Schlüssel (Erforderlich für Rackspace Cloud-Dateien)",
-    "Tenantname (required for OpenStack Object Storage)" : "Mietername (Erforderlich für Openstack-Objektspeicher)",
-    "Password (required for OpenStack Object Storage)" : "Passwort (Erforderlich für Openstack-Objektspeicher)",
-    "Service Name (required for OpenStack Object Storage)" : "Name der Dienstleistung (Erforderlich für Openstack-Objektspeicher)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL des Identitätsendpunktes (Erforderlich für Openstack-Objektspeicher)",
-    "Timeout of HTTP requests in seconds" : "Zeitüberschreitung von HTTP-Anfragen in Sekunden",
-    "Share" : "Share",
-    "SMB / CIFS using OC login" : "SMB / CIFS mit OC-Login",
-    "Username as share" : "Benutzername als Freigabe",
-    "URL" : "Adresse",
-    "Secure https://" : "Sicheres https://",
-    "SFTP with secret key login" : "SFTP mit dem Login über einen geheimen Schlüssel",
-    "Public key" : "Öffentlicher Schlüssel",
     "Storage with id \"%i\" not found" : "Der Speicher mit der ID „%i“ wurde nicht gefunden",
     "Invalid mount point" : "Ungültiger mount point",
     "Invalid storage backend \"%s\"" : "Ungültiges Speicher-Backend „%s“",
-    "Access granted" : "Zugriff gestattet",
-    "Error configuring Dropbox storage" : "Fehler beim Einrichten von Dropbox",
-    "Grant access" : "Zugriff gestatten",
-    "Error configuring Google Drive storage" : "Fehler beim Einrichten von Google Drive",
     "Personal" : "Persönlich",
     "System" : "System",
+    "Grant access" : "Zugriff gestatten",
+    "Access granted" : "Zugriff gestattet",
+    "Generate keys" : "Schlüssel erzeugen",
+    "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares",
     "Enable encryption" : "Verschlüsselung aktivieren",
     "Enable previews" : "Vorschau aktivieren",
     "Check for changes" : "Auf Änderungen überprüfen",
@@ -61,10 +20,37 @@
     "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.",
     "(group)" : "(group)",
     "Saved" : "Gespeichert",
-    "Generate keys" : "Schlüssel erzeugen",
-    "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares",
+    "None" : "Keine",
+    "App key" : "App-Schlüssel",
+    "App secret" : "Geheime Zeichenkette der App",
+    "Client ID" : "Client-ID",
+    "Client secret" : "Geheime Zeichenkette des Client",
+    "Username" : "Benutzername",
+    "Password" : "Passwort",
+    "API key" : "API-Schlüssel",
+    "Public key" : "Öffentlicher Schlüssel",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Host-Name",
+    "Port" : "Port",
+    "Region" : "Region",
+    "Enable SSL" : "SSL aktivieren",
+    "Enable Path Style" : "Pfadstil aktivieren",
+    "WebDAV" : "WebDAV",
+    "URL" : "Adresse",
+    "Remote subfolder" : "Entfernter Unterordner",
+    "Secure https://" : "Sicheres https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Host",
+    "Secure ftps://" : "Sicheres ftps://",
+    "Local" : "Lokal",
+    "Location" : "Ort",
+    "ownCloud" : "ownCloud",
+    "Root" : "Root",
+    "Share" : "Share",
+    "Username as share" : "Benutzername als Freigabe",
+    "OpenStack Object Storage" : "Openstack-Objektspeicher",
     "<b>Note:</b> " : "<b>Hinweis:</b> ",
-    "and" : "und",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die cURL-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> \"%s\" ist nicht installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.",
@@ -77,9 +63,9 @@
     "Folder name" : "Ordnername",
     "Configuration" : "Konfiguration",
     "Available for" : "Verfügbar für",
-    "Add storage" : "Speicher hinzufügen",
     "Advanced settings" : "Erweiterte Einstellungen",
     "Delete" : "Löschen",
+    "Add storage" : "Speicher hinzufügen",
     "Enable User External Storage" : "Externen Speicher für Benutzer aktivieren",
     "Allow users to mount the following external storage" : "Erlauben Sie Benutzern, folgende externe Speicher einzubinden"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/el.js b/apps/files_external/l10n/el.js
index e3b96e4cc4a..b311d615c32 100644
--- a/apps/files_external/l10n/el.js
+++ b/apps/files_external/l10n/el.js
@@ -1,59 +1,29 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Η λήψη των τεκμηρίων αιτήματος απέτυχε. Βεβαιώστε ότι το κλειδί εφαρμογής και το μυστικό του Dropbox είναι ορθά",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Η λήψη των τεκμηρίων πρόσβασης απέτυχε. Βεβαιώστε ότι το κλειδί εφαρμογής και το μυστικό του Dropbox είναι ορθά.",
-    "Please provide a valid Dropbox app key and secret." : "Παρακαλούμε δώστε έγκυρο κλειδί Dropbox και μυστικό.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Η λήψη των τεκμηρίων αιτήματος απέτυχε. Βεβαιώστε ότι το κλειδί εφαρμογής και το μυστικό είναι ορθά.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Η λήψη των τεκμηρίων πρόσβασης απέτυχε. Βεβαιώστε ότι το κλειδί εφαρμογής και το μυστικό είναι ορθά.",
+    "Please provide a valid app key and secret." : "Παρακαλούμε δώστε έγκυρο κλειδί εφαρμογής και μυστικό.",
     "Step 1 failed. Exception: %s" : "Το βήμα 1 απέτυχε. Εξαίρεση: %s",
     "Step 2 failed. Exception: %s" : "Το βήμα 2 απέτυχε. Εξαίρεση: %s",
     "External storage" : "Εξωτερική αποθήκευση",
-    "Local" : "Τοπικός",
-    "Location" : "Τοποθεσία",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Κλειδί",
-    "Secret" : "Μυστικό",
-    "Bucket" : "Κάδος",
-    "Amazon S3 and compliant" : "Amazon S3 και συμμορφούμενα",
-    "Access Key" : "Κλειδί πρόσβασης",
-    "Secret Key" : "Μυστικό κλειδί",
-    "Hostname" : "Όνομα Υπολογιστή",
-    "Port" : "Θύρα",
-    "Region" : "Περιοχή",
-    "Enable SSL" : "Ενεργοποίηση SSL",
-    "Enable Path Style" : "Ενεργοποίηση μορφής διαδρομής",
-    "App key" : "Κλειδί εφαρμογής",
-    "App secret" : "Μυστικό εφαρμογής",
-    "Host" : "Διακομιστής",
-    "Username" : "Όνομα χρήστη",
-    "Password" : "Κωδικός πρόσβασης",
-    "Remote subfolder" : "Απομακρυσμένος υποφάκελος",
-    "Secure ftps://" : "Ασφαλής ftps://",
-    "Client ID" : "ID πελάτη",
-    "Client secret" : "Μυστικό πελάτη",
-    "OpenStack Object Storage" : "Αποθήκη αντικειμένων OpenStack",
-    "Region (optional for OpenStack Object Storage)" : "Περιοχή (προαιρετικά για την αποθήκευση αντικειμένων OpenStack)",
-    "API Key (required for Rackspace Cloud Files)" : "Κλειδί API (απαιτείται για αρχεία Rackspace Cloud)",
-    "Tenantname (required for OpenStack Object Storage)" : "Όνομα ενοίκου (απαιτείται για την Αποθήκευση Αντικειμένων OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Μυστικός κωδικός (απαιτείται για την αποθήκευση αντικειμένων OpenStack)",
-    "Service Name (required for OpenStack Object Storage)" : "Όνομα υπηρεσίας (απαιτείται για την αποθήκευση αντικειμένων OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Διεύθυνση URL της ταυτότητας τελικού σημείου (απαιτείται για την αποθήκευση αντικειμένων OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Χρονικό όριο των αιτήσεων HTTP σε δευτερόλεπτα",
-    "Share" : "Διαμοιράστε",
-    "SMB / CIFS using OC login" : "SMB / CIFS χρησιμοποιώντας λογαριασμό OC",
-    "Username as share" : "Όνομα χρήστη ως διαμοιραζόμενος φάκελος",
-    "URL" : "URL",
-    "Secure https://" : "Ασφαλής σύνδεση https://",
-    "SFTP with secret key login" : "SFTP με σύνδεση με κρυφό κλειδί",
-    "Public key" : "Δημόσιο κλειδί",
     "Storage with id \"%i\" not found" : "Αποθήκευση με id \"%i\" δεν βρέθηκε",
+    "Invalid backend or authentication mechanism class" : "Μη έγκυρη κλάση συστήματος ή μηχανισμού πιστοποίησης",
     "Invalid mount point" : "Μη έγκυρο σημείο ανάρτησης",
+    "Objectstore forbidden" : "Απαγορευμένο objectstore",
     "Invalid storage backend \"%s\"" : "Μή έγκυρο σύστημα υποστήριξης αποθήκευσης  \"%s\"",
-    "Access granted" : "Πρόσβαση παρασχέθηκε",
-    "Error configuring Dropbox storage" : "Σφάλμα ρυθμίζωντας αποθήκευση Dropbox ",
-    "Grant access" : "Παροχή πρόσβασης",
-    "Error configuring Google Drive storage" : "Σφάλμα ρυθμίζωντας αποθήκευση Google Drive ",
+    "Not permitted to use backend \"%s\"" : "Μη επιτρεπόμενο σύστημα υποστήριξης \"%s\"",
+    "Not permitted to use authentication mechanism \"%s\"" : "Μη επιτρεπόμενος μηχανισμός πιστοποίησης \"%s\"",
+    "Unsatisfied backend parameters" : "Ελλιπείς παράμετροι συστήματος",
+    "Unsatisfied authentication mechanism parameters" : "Ελλιπείς παράμετροι μηχανισμού πιστοποίησης",
     "Personal" : "Προσωπικά",
     "System" : "Σύστημα",
+    "Grant access" : "Παροχή πρόσβασης",
+    "Access granted" : "Πρόσβαση παρασχέθηκε",
+    "Error configuring OAuth1" : "Σφάλμα ρύθμισης του OAuth1",
+    "Error configuring OAuth2" : "Σφάλμα ρύθμισης του OAuth2",
+    "Generate keys" : "Δημιουργία κλειδιών",
+    "Error generating key pair" : "Σφάλμα κατά τη δημιουργία ζεύγους κλειδιών",
     "Enable encryption" : "Ενεργοποίηση κρυπτογράφησης",
     "Enable previews" : "Ενεργοποίηση προεπισκοπήσεων",
     "Check for changes" : "Έλεγχος για αλλαγές",
@@ -63,10 +33,57 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Όλοι οι χρήστες. Πληκτρολογήστε για να επιλέξετε χρήστη ή ομάδα.",
     "(group)" : "(ομάδα)",
     "Saved" : "Αποθηκεύτηκαν",
-    "Generate keys" : "Δημιουργία κλειδιών",
-    "Error generating key pair" : "Σφάλμα κατά τη δημιουργία ζεύγους κλειδιών",
+    "Access key" : "Κλειδί πρόσβασης",
+    "Secret key" : "Μυστικό κλειδί",
+    "Builtin" : "Builtin",
+    "None" : "Τίποτα",
+    "OAuth1" : "OAuth1",
+    "App key" : "Κλειδί εφαρμογής",
+    "App secret" : "Μυστικό εφαρμογής",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "ID πελάτη",
+    "Client secret" : "Μυστικό πελάτη",
+    "OpenStack" : "OpenStack",
+    "Username" : "Όνομα χρήστη",
+    "Password" : "Κωδικός πρόσβασης",
+    "Tenant name" : "Όνομα \"ένοικου\"",
+    "Identity endpoint URL" : "URL τελικού σημείου ταυτοποίησης",
+    "Rackspace" : "Rackspace",
+    "API key" : "Κλειδί Google API",
+    "Username and password" : "Όνομα χρήστη και κωδικός πρόσβασης",
+    "Session credentials" : "Διαπιστευτήρια συνεδρίας",
+    "RSA public key" : "Δημόσιο κλειδί RSA",
+    "Public key" : "Δημόσιο κλειδί",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Κάδος",
+    "Hostname" : "Όνομα Υπολογιστή",
+    "Port" : "Θύρα",
+    "Region" : "Περιοχή",
+    "Enable SSL" : "Ενεργοποίηση SSL",
+    "Enable Path Style" : "Ενεργοποίηση μορφής διαδρομής",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Απομακρυσμένος υποφάκελος",
+    "Secure https://" : "Ασφαλής σύνδεση https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Διακομιστής",
+    "Secure ftps://" : "Ασφαλής ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Τοπικός",
+    "Location" : "Τοποθεσία",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Root",
+    "SFTP with secret key login [DEPRECATED]" : "SFTP με σύνδεση με κρυφό κλειδί [ΠΑΡΩΧΗΜΕΝΟ]",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Διαμοιράστε",
+    "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS χρησιμοποιώντας λογαριασμό OC [ΠΑΡΩΧΗΜΕΝΟ]",
+    "Username as share" : "Όνομα χρήστη ως διαμοιραζόμενος φάκελος",
+    "OpenStack Object Storage" : "Αποθήκη αντικειμένων OpenStack",
+    "Service name" : "Όνομα υπηρεσίας",
+    "Request timeout (seconds)" : "Χρονικό όριο αιτήματος (δευτερόλεπτα)",
     "<b>Note:</b> " : "<b>Σημείωση:</b> ",
-    "and" : "και",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Σημείωση:</b> Η υποστήριξη cURL στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Η προσάρτηση του %s δεν είναι δυνατή. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Σημείωση:</b> Η υποστήριξη FTP στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Δεν είναι δυνατή η προσάρτηση του %s. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Σημείωση:</b> Η επέκταση \"%s\" δεν είναι εγκατεστημένη. Δεν είναι δυνατή η προσάρτηση %s. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
@@ -77,11 +94,12 @@ OC.L10N.register(
     "Scope" : "Εύρος",
     "External Storage" : "Εξωτερικό Αποθηκευτικό Μέσο",
     "Folder name" : "Όνομα φακέλου",
+    "Authentication" : "Πιστοποίηση",
     "Configuration" : "Ρυθμίσεις",
     "Available for" : "Διαθέσιμο για",
-    "Add storage" : "Προσθηκη αποθηκευσης",
     "Advanced settings" : "Ρυθμίσεις για προχωρημένους",
     "Delete" : "Διαγραφή",
+    "Add storage" : "Προσθηκη αποθηκευσης",
     "Enable User External Storage" : "Ενεργοποίηση Εξωτερικού Αποθηκευτικού Χώρου Χρήστη",
     "Allow users to mount the following external storage" : "Χορήγηση άδειας στους χρήστες να συνδέσουν τα παρακάτω εξωτερικά μέσα αποθήκευσης"
 },
diff --git a/apps/files_external/l10n/el.json b/apps/files_external/l10n/el.json
index e62da96551c..f42a610cc55 100644
--- a/apps/files_external/l10n/el.json
+++ b/apps/files_external/l10n/el.json
@@ -1,57 +1,27 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Η λήψη των τεκμηρίων αιτήματος απέτυχε. Βεβαιώστε ότι το κλειδί εφαρμογής και το μυστικό του Dropbox είναι ορθά",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Η λήψη των τεκμηρίων πρόσβασης απέτυχε. Βεβαιώστε ότι το κλειδί εφαρμογής και το μυστικό του Dropbox είναι ορθά.",
-    "Please provide a valid Dropbox app key and secret." : "Παρακαλούμε δώστε έγκυρο κλειδί Dropbox και μυστικό.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Η λήψη των τεκμηρίων αιτήματος απέτυχε. Βεβαιώστε ότι το κλειδί εφαρμογής και το μυστικό είναι ορθά.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Η λήψη των τεκμηρίων πρόσβασης απέτυχε. Βεβαιώστε ότι το κλειδί εφαρμογής και το μυστικό είναι ορθά.",
+    "Please provide a valid app key and secret." : "Παρακαλούμε δώστε έγκυρο κλειδί εφαρμογής και μυστικό.",
     "Step 1 failed. Exception: %s" : "Το βήμα 1 απέτυχε. Εξαίρεση: %s",
     "Step 2 failed. Exception: %s" : "Το βήμα 2 απέτυχε. Εξαίρεση: %s",
     "External storage" : "Εξωτερική αποθήκευση",
-    "Local" : "Τοπικός",
-    "Location" : "Τοποθεσία",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Κλειδί",
-    "Secret" : "Μυστικό",
-    "Bucket" : "Κάδος",
-    "Amazon S3 and compliant" : "Amazon S3 και συμμορφούμενα",
-    "Access Key" : "Κλειδί πρόσβασης",
-    "Secret Key" : "Μυστικό κλειδί",
-    "Hostname" : "Όνομα Υπολογιστή",
-    "Port" : "Θύρα",
-    "Region" : "Περιοχή",
-    "Enable SSL" : "Ενεργοποίηση SSL",
-    "Enable Path Style" : "Ενεργοποίηση μορφής διαδρομής",
-    "App key" : "Κλειδί εφαρμογής",
-    "App secret" : "Μυστικό εφαρμογής",
-    "Host" : "Διακομιστής",
-    "Username" : "Όνομα χρήστη",
-    "Password" : "Κωδικός πρόσβασης",
-    "Remote subfolder" : "Απομακρυσμένος υποφάκελος",
-    "Secure ftps://" : "Ασφαλής ftps://",
-    "Client ID" : "ID πελάτη",
-    "Client secret" : "Μυστικό πελάτη",
-    "OpenStack Object Storage" : "Αποθήκη αντικειμένων OpenStack",
-    "Region (optional for OpenStack Object Storage)" : "Περιοχή (προαιρετικά για την αποθήκευση αντικειμένων OpenStack)",
-    "API Key (required for Rackspace Cloud Files)" : "Κλειδί API (απαιτείται για αρχεία Rackspace Cloud)",
-    "Tenantname (required for OpenStack Object Storage)" : "Όνομα ενοίκου (απαιτείται για την Αποθήκευση Αντικειμένων OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Μυστικός κωδικός (απαιτείται για την αποθήκευση αντικειμένων OpenStack)",
-    "Service Name (required for OpenStack Object Storage)" : "Όνομα υπηρεσίας (απαιτείται για την αποθήκευση αντικειμένων OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Διεύθυνση URL της ταυτότητας τελικού σημείου (απαιτείται για την αποθήκευση αντικειμένων OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Χρονικό όριο των αιτήσεων HTTP σε δευτερόλεπτα",
-    "Share" : "Διαμοιράστε",
-    "SMB / CIFS using OC login" : "SMB / CIFS χρησιμοποιώντας λογαριασμό OC",
-    "Username as share" : "Όνομα χρήστη ως διαμοιραζόμενος φάκελος",
-    "URL" : "URL",
-    "Secure https://" : "Ασφαλής σύνδεση https://",
-    "SFTP with secret key login" : "SFTP με σύνδεση με κρυφό κλειδί",
-    "Public key" : "Δημόσιο κλειδί",
     "Storage with id \"%i\" not found" : "Αποθήκευση με id \"%i\" δεν βρέθηκε",
+    "Invalid backend or authentication mechanism class" : "Μη έγκυρη κλάση συστήματος ή μηχανισμού πιστοποίησης",
     "Invalid mount point" : "Μη έγκυρο σημείο ανάρτησης",
+    "Objectstore forbidden" : "Απαγορευμένο objectstore",
     "Invalid storage backend \"%s\"" : "Μή έγκυρο σύστημα υποστήριξης αποθήκευσης  \"%s\"",
-    "Access granted" : "Πρόσβαση παρασχέθηκε",
-    "Error configuring Dropbox storage" : "Σφάλμα ρυθμίζωντας αποθήκευση Dropbox ",
-    "Grant access" : "Παροχή πρόσβασης",
-    "Error configuring Google Drive storage" : "Σφάλμα ρυθμίζωντας αποθήκευση Google Drive ",
+    "Not permitted to use backend \"%s\"" : "Μη επιτρεπόμενο σύστημα υποστήριξης \"%s\"",
+    "Not permitted to use authentication mechanism \"%s\"" : "Μη επιτρεπόμενος μηχανισμός πιστοποίησης \"%s\"",
+    "Unsatisfied backend parameters" : "Ελλιπείς παράμετροι συστήματος",
+    "Unsatisfied authentication mechanism parameters" : "Ελλιπείς παράμετροι μηχανισμού πιστοποίησης",
     "Personal" : "Προσωπικά",
     "System" : "Σύστημα",
+    "Grant access" : "Παροχή πρόσβασης",
+    "Access granted" : "Πρόσβαση παρασχέθηκε",
+    "Error configuring OAuth1" : "Σφάλμα ρύθμισης του OAuth1",
+    "Error configuring OAuth2" : "Σφάλμα ρύθμισης του OAuth2",
+    "Generate keys" : "Δημιουργία κλειδιών",
+    "Error generating key pair" : "Σφάλμα κατά τη δημιουργία ζεύγους κλειδιών",
     "Enable encryption" : "Ενεργοποίηση κρυπτογράφησης",
     "Enable previews" : "Ενεργοποίηση προεπισκοπήσεων",
     "Check for changes" : "Έλεγχος για αλλαγές",
@@ -61,10 +31,57 @@
     "All users. Type to select user or group." : "Όλοι οι χρήστες. Πληκτρολογήστε για να επιλέξετε χρήστη ή ομάδα.",
     "(group)" : "(ομάδα)",
     "Saved" : "Αποθηκεύτηκαν",
-    "Generate keys" : "Δημιουργία κλειδιών",
-    "Error generating key pair" : "Σφάλμα κατά τη δημιουργία ζεύγους κλειδιών",
+    "Access key" : "Κλειδί πρόσβασης",
+    "Secret key" : "Μυστικό κλειδί",
+    "Builtin" : "Builtin",
+    "None" : "Τίποτα",
+    "OAuth1" : "OAuth1",
+    "App key" : "Κλειδί εφαρμογής",
+    "App secret" : "Μυστικό εφαρμογής",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "ID πελάτη",
+    "Client secret" : "Μυστικό πελάτη",
+    "OpenStack" : "OpenStack",
+    "Username" : "Όνομα χρήστη",
+    "Password" : "Κωδικός πρόσβασης",
+    "Tenant name" : "Όνομα \"ένοικου\"",
+    "Identity endpoint URL" : "URL τελικού σημείου ταυτοποίησης",
+    "Rackspace" : "Rackspace",
+    "API key" : "Κλειδί Google API",
+    "Username and password" : "Όνομα χρήστη και κωδικός πρόσβασης",
+    "Session credentials" : "Διαπιστευτήρια συνεδρίας",
+    "RSA public key" : "Δημόσιο κλειδί RSA",
+    "Public key" : "Δημόσιο κλειδί",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Κάδος",
+    "Hostname" : "Όνομα Υπολογιστή",
+    "Port" : "Θύρα",
+    "Region" : "Περιοχή",
+    "Enable SSL" : "Ενεργοποίηση SSL",
+    "Enable Path Style" : "Ενεργοποίηση μορφής διαδρομής",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Απομακρυσμένος υποφάκελος",
+    "Secure https://" : "Ασφαλής σύνδεση https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Διακομιστής",
+    "Secure ftps://" : "Ασφαλής ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Τοπικός",
+    "Location" : "Τοποθεσία",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Root",
+    "SFTP with secret key login [DEPRECATED]" : "SFTP με σύνδεση με κρυφό κλειδί [ΠΑΡΩΧΗΜΕΝΟ]",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Διαμοιράστε",
+    "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS χρησιμοποιώντας λογαριασμό OC [ΠΑΡΩΧΗΜΕΝΟ]",
+    "Username as share" : "Όνομα χρήστη ως διαμοιραζόμενος φάκελος",
+    "OpenStack Object Storage" : "Αποθήκη αντικειμένων OpenStack",
+    "Service name" : "Όνομα υπηρεσίας",
+    "Request timeout (seconds)" : "Χρονικό όριο αιτήματος (δευτερόλεπτα)",
     "<b>Note:</b> " : "<b>Σημείωση:</b> ",
-    "and" : "και",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Σημείωση:</b> Η υποστήριξη cURL στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Η προσάρτηση του %s δεν είναι δυνατή. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Σημείωση:</b> Η υποστήριξη FTP στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Δεν είναι δυνατή η προσάρτηση του %s. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Σημείωση:</b> Η επέκταση \"%s\" δεν είναι εγκατεστημένη. Δεν είναι δυνατή η προσάρτηση %s. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
@@ -75,11 +92,12 @@
     "Scope" : "Εύρος",
     "External Storage" : "Εξωτερικό Αποθηκευτικό Μέσο",
     "Folder name" : "Όνομα φακέλου",
+    "Authentication" : "Πιστοποίηση",
     "Configuration" : "Ρυθμίσεις",
     "Available for" : "Διαθέσιμο για",
-    "Add storage" : "Προσθηκη αποθηκευσης",
     "Advanced settings" : "Ρυθμίσεις για προχωρημένους",
     "Delete" : "Διαγραφή",
+    "Add storage" : "Προσθηκη αποθηκευσης",
     "Enable User External Storage" : "Ενεργοποίηση Εξωτερικού Αποθηκευτικού Χώρου Χρήστη",
     "Allow users to mount the following external storage" : "Χορήγηση άδειας στους χρήστες να συνδέσουν τα παρακάτω εξωτερικά μέσα αποθήκευσης"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/en_GB.js b/apps/files_external/l10n/en_GB.js
index 29c1eebb7e3..8b1c0cdd328 100644
--- a/apps/files_external/l10n/en_GB.js
+++ b/apps/files_external/l10n/en_GB.js
@@ -1,59 +1,18 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct.",
-    "Please provide a valid Dropbox app key and secret." : "Please provide a valid Dropbox app key and secret.",
     "Step 1 failed. Exception: %s" : "Step 1 failed. Exception: %s",
     "Step 2 failed. Exception: %s" : "Step 2 failed. Exception: %s",
     "External storage" : "External storage",
-    "Local" : "Local",
-    "Location" : "Location",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Key",
-    "Secret" : "Secret",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 and compliant",
-    "Access Key" : "Access Key",
-    "Secret Key" : "Secret Key",
-    "Hostname" : "Hostname",
-    "Port" : "Port",
-    "Region" : "Region",
-    "Enable SSL" : "Enable SSL",
-    "Enable Path Style" : "Enable Path Style",
-    "App key" : "App key",
-    "App secret" : "App secret",
-    "Host" : "Host",
-    "Username" : "Username",
-    "Password" : "Password",
-    "Remote subfolder" : "Remote subfolder",
-    "Secure ftps://" : "Secure ftps://",
-    "Client ID" : "Client ID",
-    "Client secret" : "Client secret",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Region (optional for OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (required for Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (required for OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Password (required for OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Service Name (required for OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL of identity endpoint (required for OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Timeout of HTTP requests in seconds",
-    "Share" : "Share",
-    "SMB / CIFS using OC login" : "SMB / CIFS using OC login",
-    "Username as share" : "Username as share",
-    "URL" : "URL",
-    "Secure https://" : "Secure https://",
-    "SFTP with secret key login" : "SFTP with secret key login",
-    "Public key" : "Public key",
     "Storage with id \"%i\" not found" : "Storage with id \"%i\" not found",
     "Invalid mount point" : "Invalid mount point",
     "Invalid storage backend \"%s\"" : "Invalid storage backend \"%s\"",
-    "Access granted" : "Access granted",
-    "Error configuring Dropbox storage" : "Error configuring Dropbox storage",
-    "Grant access" : "Grant access",
-    "Error configuring Google Drive storage" : "Error configuring Google Drive storage",
     "Personal" : "Personal",
     "System" : "System",
+    "Grant access" : "Grant access",
+    "Access granted" : "Access granted",
+    "Generate keys" : "Generate keys",
+    "Error generating key pair" : "Error generating key pair",
     "Enable encryption" : "Enable encryption",
     "Enable previews" : "Enable previews",
     "Check for changes" : "Check for changes",
@@ -63,10 +22,37 @@ OC.L10N.register(
     "All users. Type to select user or group." : "All users. Type to select user or group.",
     "(group)" : "(group)",
     "Saved" : "Saved",
-    "Generate keys" : "Generate keys",
-    "Error generating key pair" : "Error generating key pair",
+    "None" : "None",
+    "App key" : "App key",
+    "App secret" : "App secret",
+    "Client ID" : "Client ID",
+    "Client secret" : "Client secret",
+    "Username" : "Username",
+    "Password" : "Password",
+    "API key" : "API key",
+    "Public key" : "Public key",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Hostname",
+    "Port" : "Port",
+    "Region" : "Region",
+    "Enable SSL" : "Enable SSL",
+    "Enable Path Style" : "Enable Path Style",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Remote subfolder",
+    "Secure https://" : "Secure https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Host",
+    "Secure ftps://" : "Secure ftps://",
+    "Local" : "Local",
+    "Location" : "Location",
+    "ownCloud" : "ownCloud",
+    "Root" : "Root",
+    "Share" : "Share",
+    "Username as share" : "Username as share",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Note:</b> ",
-    "and" : "and",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it.",
@@ -79,9 +65,9 @@ OC.L10N.register(
     "Folder name" : "Folder name",
     "Configuration" : "Configuration",
     "Available for" : "Available for",
-    "Add storage" : "Add storage",
     "Advanced settings" : "Advanced settings",
     "Delete" : "Delete",
+    "Add storage" : "Add storage",
     "Enable User External Storage" : "Enable User External Storage",
     "Allow users to mount the following external storage" : "Allow users to mount the following external storage"
 },
diff --git a/apps/files_external/l10n/en_GB.json b/apps/files_external/l10n/en_GB.json
index af3950f8ef0..78feab7a08f 100644
--- a/apps/files_external/l10n/en_GB.json
+++ b/apps/files_external/l10n/en_GB.json
@@ -1,57 +1,16 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct.",
-    "Please provide a valid Dropbox app key and secret." : "Please provide a valid Dropbox app key and secret.",
     "Step 1 failed. Exception: %s" : "Step 1 failed. Exception: %s",
     "Step 2 failed. Exception: %s" : "Step 2 failed. Exception: %s",
     "External storage" : "External storage",
-    "Local" : "Local",
-    "Location" : "Location",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Key",
-    "Secret" : "Secret",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 and compliant",
-    "Access Key" : "Access Key",
-    "Secret Key" : "Secret Key",
-    "Hostname" : "Hostname",
-    "Port" : "Port",
-    "Region" : "Region",
-    "Enable SSL" : "Enable SSL",
-    "Enable Path Style" : "Enable Path Style",
-    "App key" : "App key",
-    "App secret" : "App secret",
-    "Host" : "Host",
-    "Username" : "Username",
-    "Password" : "Password",
-    "Remote subfolder" : "Remote subfolder",
-    "Secure ftps://" : "Secure ftps://",
-    "Client ID" : "Client ID",
-    "Client secret" : "Client secret",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Region (optional for OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (required for Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (required for OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Password (required for OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Service Name (required for OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL of identity endpoint (required for OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Timeout of HTTP requests in seconds",
-    "Share" : "Share",
-    "SMB / CIFS using OC login" : "SMB / CIFS using OC login",
-    "Username as share" : "Username as share",
-    "URL" : "URL",
-    "Secure https://" : "Secure https://",
-    "SFTP with secret key login" : "SFTP with secret key login",
-    "Public key" : "Public key",
     "Storage with id \"%i\" not found" : "Storage with id \"%i\" not found",
     "Invalid mount point" : "Invalid mount point",
     "Invalid storage backend \"%s\"" : "Invalid storage backend \"%s\"",
-    "Access granted" : "Access granted",
-    "Error configuring Dropbox storage" : "Error configuring Dropbox storage",
-    "Grant access" : "Grant access",
-    "Error configuring Google Drive storage" : "Error configuring Google Drive storage",
     "Personal" : "Personal",
     "System" : "System",
+    "Grant access" : "Grant access",
+    "Access granted" : "Access granted",
+    "Generate keys" : "Generate keys",
+    "Error generating key pair" : "Error generating key pair",
     "Enable encryption" : "Enable encryption",
     "Enable previews" : "Enable previews",
     "Check for changes" : "Check for changes",
@@ -61,10 +20,37 @@
     "All users. Type to select user or group." : "All users. Type to select user or group.",
     "(group)" : "(group)",
     "Saved" : "Saved",
-    "Generate keys" : "Generate keys",
-    "Error generating key pair" : "Error generating key pair",
+    "None" : "None",
+    "App key" : "App key",
+    "App secret" : "App secret",
+    "Client ID" : "Client ID",
+    "Client secret" : "Client secret",
+    "Username" : "Username",
+    "Password" : "Password",
+    "API key" : "API key",
+    "Public key" : "Public key",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Hostname",
+    "Port" : "Port",
+    "Region" : "Region",
+    "Enable SSL" : "Enable SSL",
+    "Enable Path Style" : "Enable Path Style",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Remote subfolder",
+    "Secure https://" : "Secure https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Host",
+    "Secure ftps://" : "Secure ftps://",
+    "Local" : "Local",
+    "Location" : "Location",
+    "ownCloud" : "ownCloud",
+    "Root" : "Root",
+    "Share" : "Share",
+    "Username as share" : "Username as share",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Note:</b> ",
-    "and" : "and",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it.",
@@ -77,9 +63,9 @@
     "Folder name" : "Folder name",
     "Configuration" : "Configuration",
     "Available for" : "Available for",
-    "Add storage" : "Add storage",
     "Advanced settings" : "Advanced settings",
     "Delete" : "Delete",
+    "Add storage" : "Add storage",
     "Enable User External Storage" : "Enable User External Storage",
     "Allow users to mount the following external storage" : "Allow users to mount the following external storage"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/eo.js b/apps/files_external/l10n/eo.js
index d781b947c0f..8a8884777e6 100644
--- a/apps/files_external/l10n/eo.js
+++ b/apps/files_external/l10n/eo.js
@@ -1,50 +1,45 @@
 OC.L10N.register(
     "files_external",
     {
-    "Please provide a valid Dropbox app key and secret." : "Bonvolu provizi ŝlosilon de la aplikaĵo Dropbox validan kaj sekretan.",
     "External storage" : "Malena memorilo",
-    "Local" : "Loka",
-    "Location" : "Loko",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Klavo",
-    "Secret" : "Sekreto",
-    "Access Key" : "Aliroklavo",
-    "Secret Key" : "Sekretoklavo",
-    "Port" : "Pordo",
-    "Region" : "Regiono",
-    "Enable SSL" : "Kapabligi SSL-on",
+    "Personal" : "Persona",
+    "Grant access" : "Doni alirpermeson",
+    "Access granted" : "Alirpermeso donita",
+    "Saved" : "Konservita",
+    "None" : "Nenio",
     "App key" : "Aplikaĵoklavo",
     "App secret" : "Aplikaĵosekreto",
-    "Host" : "Gastigo",
+    "Client ID" : "Klientidentigilo",
+    "Client secret" : "Klientosekreto",
     "Username" : "Uzantonomo",
     "Password" : "Pasvorto",
+    "API key" : "API-klavo",
+    "Public key" : "Publika ŝlosilo",
+    "Amazon S3" : "Amazon S3",
+    "Port" : "Pordo",
+    "Region" : "Regiono",
+    "Enable SSL" : "Kapabligi SSL-on",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Remote subfolder" : "Malloka subdosierujo",
+    "Secure https://" : "Sekura https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Gastigo",
     "Secure ftps://" : "Sekura ftps://",
-    "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)",
+    "Local" : "Loka",
+    "Location" : "Loko",
+    "ownCloud" : "ownCloud",
+    "Root" : "Radiko",
     "Share" : "Kunhavigi",
-    "URL" : "URL",
-    "Secure https://" : "Sekura https://",
-    "Public key" : "Publika ŝlosilo",
-    "Access granted" : "Alirpermeso donita",
-    "Error configuring Dropbox storage" : "Eraro dum agordado de la memorservo Dropbox",
-    "Grant access" : "Doni alirpermeson",
-    "Error configuring Google Drive storage" : "Eraro dum agordado de la memorservo Google Drive",
-    "Personal" : "Persona",
-    "Saved" : "Konservita",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Noto:</b>",
     "Name" : "Nomo",
     "External Storage" : "Malena memorilo",
     "Folder name" : "Dosierujnomo",
     "Configuration" : "Agordo",
     "Available for" : "Disponebla por",
-    "Add storage" : "Aldoni memorilon",
     "Delete" : "Forigi",
+    "Add storage" : "Aldoni memorilon",
     "Enable User External Storage" : "Kapabligi malenan memorilon de uzanto",
     "Allow users to mount the following external storage" : "Permesi uzantojn munti la jenajn malenajn memorilojn"
 },
diff --git a/apps/files_external/l10n/eo.json b/apps/files_external/l10n/eo.json
index 795be07ce2f..6741a31e72a 100644
--- a/apps/files_external/l10n/eo.json
+++ b/apps/files_external/l10n/eo.json
@@ -1,48 +1,43 @@
 { "translations": {
-    "Please provide a valid Dropbox app key and secret." : "Bonvolu provizi ŝlosilon de la aplikaĵo Dropbox validan kaj sekretan.",
     "External storage" : "Malena memorilo",
-    "Local" : "Loka",
-    "Location" : "Loko",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Klavo",
-    "Secret" : "Sekreto",
-    "Access Key" : "Aliroklavo",
-    "Secret Key" : "Sekretoklavo",
-    "Port" : "Pordo",
-    "Region" : "Regiono",
-    "Enable SSL" : "Kapabligi SSL-on",
+    "Personal" : "Persona",
+    "Grant access" : "Doni alirpermeson",
+    "Access granted" : "Alirpermeso donita",
+    "Saved" : "Konservita",
+    "None" : "Nenio",
     "App key" : "Aplikaĵoklavo",
     "App secret" : "Aplikaĵosekreto",
-    "Host" : "Gastigo",
+    "Client ID" : "Klientidentigilo",
+    "Client secret" : "Klientosekreto",
     "Username" : "Uzantonomo",
     "Password" : "Pasvorto",
+    "API key" : "API-klavo",
+    "Public key" : "Publika ŝlosilo",
+    "Amazon S3" : "Amazon S3",
+    "Port" : "Pordo",
+    "Region" : "Regiono",
+    "Enable SSL" : "Kapabligi SSL-on",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Remote subfolder" : "Malloka subdosierujo",
+    "Secure https://" : "Sekura https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Gastigo",
     "Secure ftps://" : "Sekura ftps://",
-    "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)",
+    "Local" : "Loka",
+    "Location" : "Loko",
+    "ownCloud" : "ownCloud",
+    "Root" : "Radiko",
     "Share" : "Kunhavigi",
-    "URL" : "URL",
-    "Secure https://" : "Sekura https://",
-    "Public key" : "Publika ŝlosilo",
-    "Access granted" : "Alirpermeso donita",
-    "Error configuring Dropbox storage" : "Eraro dum agordado de la memorservo Dropbox",
-    "Grant access" : "Doni alirpermeson",
-    "Error configuring Google Drive storage" : "Eraro dum agordado de la memorservo Google Drive",
-    "Personal" : "Persona",
-    "Saved" : "Konservita",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Noto:</b>",
     "Name" : "Nomo",
     "External Storage" : "Malena memorilo",
     "Folder name" : "Dosierujnomo",
     "Configuration" : "Agordo",
     "Available for" : "Disponebla por",
-    "Add storage" : "Aldoni memorilon",
     "Delete" : "Forigi",
+    "Add storage" : "Aldoni memorilon",
     "Enable User External Storage" : "Kapabligi malenan memorilon de uzanto",
     "Allow users to mount the following external storage" : "Permesi uzantojn munti la jenajn malenajn memorilojn"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/es.js b/apps/files_external/l10n/es.js
index dbe7923d1f6..62d09425f72 100644
--- a/apps/files_external/l10n/es.js
+++ b/apps/files_external/l10n/es.js
@@ -1,59 +1,20 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "La descarga de los tokens solicitados ha fallado. Verifique que la clave y el secreto de su app Dropbox sean correctos.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "La descarga de los tokens de acceso ha fallado. Verifique que la clave y el secreto de su app Dropbox es correcta.",
-    "Please provide a valid Dropbox app key and secret." : "Por favor, proporcione un una clave válida de la app Dropbox y una clave secreta.",
     "Step 1 failed. Exception: %s" : "El paso 1 falló. Excepción: %s",
     "Step 2 failed. Exception: %s" : "El paso 2 falló. Excepción: %s",
     "External storage" : "Almacenamiento externo",
-    "Local" : "Local",
-    "Location" : "Ubicación",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Clave",
-    "Secret" : "Secreto",
-    "Bucket" : "Depósito",
-    "Amazon S3 and compliant" : "Amazon S3 y compatibilidad",
-    "Access Key" : "Clave de Acceso",
-    "Secret Key" : "Clave secreta",
-    "Hostname" : "Nombre de equipo",
-    "Port" : "Puerto",
-    "Region" : "Región",
-    "Enable SSL" : "Habilitar SSL",
-    "Enable Path Style" : "Habilitar Estilo de Ruta",
-    "App key" : "App principal",
-    "App secret" : "App secreta",
-    "Host" : "Servidor",
-    "Username" : "Nombre de usuario",
-    "Password" : "Contraseña",
-    "Remote subfolder" : "Subcarpeta remota",
-    "Secure ftps://" : "—Seguro— ftps://",
-    "Client ID" : "ID de Cliente",
-    "Client secret" : "Cliente secreto",
-    "OpenStack Object Storage" : "Almacenamiento de objeto OpenStack",
-    "Region (optional for OpenStack Object Storage)" : "Región (opcional para OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Clave API (requerida para Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nombre de Inquilino (requerido para OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Contraseña (requerida para OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nombre de Servicio (requerido para OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL de identidad de punto final (requerido para OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Tiempo de espera de solicitudes HTTP en segundos",
-    "Share" : "Compartir",
-    "SMB / CIFS using OC login" : "SMB / CIFS que usan acceso OC",
-    "Username as share" : "Nombre de usuario como compartir",
-    "URL" : "URL",
-    "Secure https://" : "—Seguro— https://",
-    "SFTP with secret key login" : "Inicio de sesión SFTP con clave secreta",
-    "Public key" : "Clave pública",
     "Storage with id \"%i\" not found" : "No se ha encontrado almacenamiento con id \"%i\"",
     "Invalid mount point" : "Punto de montaje no válido",
     "Invalid storage backend \"%s\"" : "Motor de almacenamiento no válido «%s»",
-    "Access granted" : "Acceso concedido",
-    "Error configuring Dropbox storage" : "Error al configurar el almacenamiento de Dropbox",
-    "Grant access" : "Conceder acceso",
-    "Error configuring Google Drive storage" : "Error al configurar el almacenamiento de Google Drive",
     "Personal" : "Personal",
     "System" : "Sistema",
+    "Grant access" : "Conceder acceso",
+    "Access granted" : "Acceso concedido",
+    "Error configuring OAuth1" : "Error al configurar OAuth1",
+    "Error configuring OAuth2" : "Error al configurar OAuth2",
+    "Generate keys" : "Generar claves",
+    "Error generating key pair" : "Error al generar el par de claves",
     "Enable encryption" : "Habilitar cifrado",
     "Enable previews" : "Habilitar previsualizaciones",
     "Check for changes" : "Comprobar si hay cambios",
@@ -63,10 +24,47 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Todos los usuarios. Teclee para seleccionar un usuario o grupo.",
     "(group)" : "(grupo)",
     "Saved" : "Guardado",
-    "Generate keys" : "Generar claves",
-    "Error generating key pair" : "Error al generar el par de claves",
+    "Access key" : "Clave de acceso",
+    "Secret key" : "Clave secreta",
+    "None" : "Ninguno",
+    "OAuth1" : "OAuth1",
+    "App key" : "App principal",
+    "App secret" : "App secreta",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "ID de Cliente",
+    "Client secret" : "Cliente secreto",
+    "Username" : "Nombre de usuario",
+    "Password" : "Contraseña",
+    "API key" : "clave API",
+    "Username and password" : "Nombre de usuario y contraseña",
+    "Session credentials" : "Credenciales de la sesión",
+    "Public key" : "Clave pública",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Depósito",
+    "Hostname" : "Nombre de equipo",
+    "Port" : "Puerto",
+    "Region" : "Región",
+    "Enable SSL" : "Habilitar SSL",
+    "Enable Path Style" : "Habilitar Estilo de Ruta",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Subcarpeta remota",
+    "Secure https://" : "—Seguro— https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Servidor",
+    "Secure ftps://" : "—Seguro— ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Local",
+    "Location" : "Ubicación",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Raíz",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Compartir",
+    "Username as share" : "Nombre de usuario como compartir",
+    "OpenStack Object Storage" : "Almacenamiento de objeto OpenStack",
     "<b>Note:</b> " : "<b>Nota:</b> ",
-    "and" : "y",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El soporte de cURL en PHP no está activado o instalado. No se puede montar %s. Pídale al administrador del sistema que lo instale.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El soporte de FTP en PHP no está activado o instalado. No se puede montar %s. Pídale al administrador del sistema que lo instale.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> \"%s\" no está instalado. No se puede montar %s. Pídale al administrador del sistema que lo instale.",
@@ -77,11 +75,12 @@ OC.L10N.register(
     "Scope" : "Ámbito",
     "External Storage" : "Almacenamiento externo",
     "Folder name" : "Nombre de la carpeta",
+    "Authentication" : "Autenticación",
     "Configuration" : "Configuración",
     "Available for" : "Disponible para",
-    "Add storage" : "Añadir almacenamiento",
     "Advanced settings" : "Configuración avanzada",
     "Delete" : "Eliminar",
+    "Add storage" : "Añadir almacenamiento",
     "Enable User External Storage" : "Habilitar almacenamiento externo de usuario",
     "Allow users to mount the following external storage" : "Permitir a los usuarios montar el siguiente almacenamiento externo"
 },
diff --git a/apps/files_external/l10n/es.json b/apps/files_external/l10n/es.json
index f2439287934..6bcfca820f5 100644
--- a/apps/files_external/l10n/es.json
+++ b/apps/files_external/l10n/es.json
@@ -1,57 +1,18 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "La descarga de los tokens solicitados ha fallado. Verifique que la clave y el secreto de su app Dropbox sean correctos.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "La descarga de los tokens de acceso ha fallado. Verifique que la clave y el secreto de su app Dropbox es correcta.",
-    "Please provide a valid Dropbox app key and secret." : "Por favor, proporcione un una clave válida de la app Dropbox y una clave secreta.",
     "Step 1 failed. Exception: %s" : "El paso 1 falló. Excepción: %s",
     "Step 2 failed. Exception: %s" : "El paso 2 falló. Excepción: %s",
     "External storage" : "Almacenamiento externo",
-    "Local" : "Local",
-    "Location" : "Ubicación",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Clave",
-    "Secret" : "Secreto",
-    "Bucket" : "Depósito",
-    "Amazon S3 and compliant" : "Amazon S3 y compatibilidad",
-    "Access Key" : "Clave de Acceso",
-    "Secret Key" : "Clave secreta",
-    "Hostname" : "Nombre de equipo",
-    "Port" : "Puerto",
-    "Region" : "Región",
-    "Enable SSL" : "Habilitar SSL",
-    "Enable Path Style" : "Habilitar Estilo de Ruta",
-    "App key" : "App principal",
-    "App secret" : "App secreta",
-    "Host" : "Servidor",
-    "Username" : "Nombre de usuario",
-    "Password" : "Contraseña",
-    "Remote subfolder" : "Subcarpeta remota",
-    "Secure ftps://" : "—Seguro— ftps://",
-    "Client ID" : "ID de Cliente",
-    "Client secret" : "Cliente secreto",
-    "OpenStack Object Storage" : "Almacenamiento de objeto OpenStack",
-    "Region (optional for OpenStack Object Storage)" : "Región (opcional para OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Clave API (requerida para Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nombre de Inquilino (requerido para OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Contraseña (requerida para OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nombre de Servicio (requerido para OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL de identidad de punto final (requerido para OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Tiempo de espera de solicitudes HTTP en segundos",
-    "Share" : "Compartir",
-    "SMB / CIFS using OC login" : "SMB / CIFS que usan acceso OC",
-    "Username as share" : "Nombre de usuario como compartir",
-    "URL" : "URL",
-    "Secure https://" : "—Seguro— https://",
-    "SFTP with secret key login" : "Inicio de sesión SFTP con clave secreta",
-    "Public key" : "Clave pública",
     "Storage with id \"%i\" not found" : "No se ha encontrado almacenamiento con id \"%i\"",
     "Invalid mount point" : "Punto de montaje no válido",
     "Invalid storage backend \"%s\"" : "Motor de almacenamiento no válido «%s»",
-    "Access granted" : "Acceso concedido",
-    "Error configuring Dropbox storage" : "Error al configurar el almacenamiento de Dropbox",
-    "Grant access" : "Conceder acceso",
-    "Error configuring Google Drive storage" : "Error al configurar el almacenamiento de Google Drive",
     "Personal" : "Personal",
     "System" : "Sistema",
+    "Grant access" : "Conceder acceso",
+    "Access granted" : "Acceso concedido",
+    "Error configuring OAuth1" : "Error al configurar OAuth1",
+    "Error configuring OAuth2" : "Error al configurar OAuth2",
+    "Generate keys" : "Generar claves",
+    "Error generating key pair" : "Error al generar el par de claves",
     "Enable encryption" : "Habilitar cifrado",
     "Enable previews" : "Habilitar previsualizaciones",
     "Check for changes" : "Comprobar si hay cambios",
@@ -61,10 +22,47 @@
     "All users. Type to select user or group." : "Todos los usuarios. Teclee para seleccionar un usuario o grupo.",
     "(group)" : "(grupo)",
     "Saved" : "Guardado",
-    "Generate keys" : "Generar claves",
-    "Error generating key pair" : "Error al generar el par de claves",
+    "Access key" : "Clave de acceso",
+    "Secret key" : "Clave secreta",
+    "None" : "Ninguno",
+    "OAuth1" : "OAuth1",
+    "App key" : "App principal",
+    "App secret" : "App secreta",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "ID de Cliente",
+    "Client secret" : "Cliente secreto",
+    "Username" : "Nombre de usuario",
+    "Password" : "Contraseña",
+    "API key" : "clave API",
+    "Username and password" : "Nombre de usuario y contraseña",
+    "Session credentials" : "Credenciales de la sesión",
+    "Public key" : "Clave pública",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Depósito",
+    "Hostname" : "Nombre de equipo",
+    "Port" : "Puerto",
+    "Region" : "Región",
+    "Enable SSL" : "Habilitar SSL",
+    "Enable Path Style" : "Habilitar Estilo de Ruta",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Subcarpeta remota",
+    "Secure https://" : "—Seguro— https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Servidor",
+    "Secure ftps://" : "—Seguro— ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Local",
+    "Location" : "Ubicación",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Raíz",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Compartir",
+    "Username as share" : "Nombre de usuario como compartir",
+    "OpenStack Object Storage" : "Almacenamiento de objeto OpenStack",
     "<b>Note:</b> " : "<b>Nota:</b> ",
-    "and" : "y",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El soporte de cURL en PHP no está activado o instalado. No se puede montar %s. Pídale al administrador del sistema que lo instale.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El soporte de FTP en PHP no está activado o instalado. No se puede montar %s. Pídale al administrador del sistema que lo instale.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> \"%s\" no está instalado. No se puede montar %s. Pídale al administrador del sistema que lo instale.",
@@ -75,11 +73,12 @@
     "Scope" : "Ámbito",
     "External Storage" : "Almacenamiento externo",
     "Folder name" : "Nombre de la carpeta",
+    "Authentication" : "Autenticación",
     "Configuration" : "Configuración",
     "Available for" : "Disponible para",
-    "Add storage" : "Añadir almacenamiento",
     "Advanced settings" : "Configuración avanzada",
     "Delete" : "Eliminar",
+    "Add storage" : "Añadir almacenamiento",
     "Enable User External Storage" : "Habilitar almacenamiento externo de usuario",
     "Allow users to mount the following external storage" : "Permitir a los usuarios montar el siguiente almacenamiento externo"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/es_AR.js b/apps/files_external/l10n/es_AR.js
index 0936079fbc2..383b511a75f 100644
--- a/apps/files_external/l10n/es_AR.js
+++ b/apps/files_external/l10n/es_AR.js
@@ -1,28 +1,29 @@
 OC.L10N.register(
     "files_external",
     {
-    "Please provide a valid Dropbox app key and secret." : "Por favor, proporcioná un secreto y una contraseña válida para la aplicación Dropbox.",
     "External storage" : "Almacenamiento externo",
-    "Location" : "Ubicación",
+    "Personal" : "Personal",
+    "Grant access" : "Permitir acceso",
+    "Access granted" : "Acceso permitido",
+    "Saved" : "Guardado",
+    "None" : "Ninguno",
+    "Username" : "Nombre de usuario",
+    "Password" : "Contraseña",
+    "API key" : "clave API",
     "Port" : "Puerto",
     "Region" : "Provincia",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Host" : "Servidor",
-    "Username" : "Nombre de usuario",
-    "Password" : "Contraseña",
+    "Location" : "Ubicación",
+    "ownCloud" : "ownCloud",
     "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",
+    "Add storage" : "Añadir almacenamiento",
     "Enable User External Storage" : "Habilitar almacenamiento de usuario externo"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/es_AR.json b/apps/files_external/l10n/es_AR.json
index 3b971a1883c..0389f98e647 100644
--- a/apps/files_external/l10n/es_AR.json
+++ b/apps/files_external/l10n/es_AR.json
@@ -1,26 +1,27 @@
 { "translations": {
-    "Please provide a valid Dropbox app key and secret." : "Por favor, proporcioná un secreto y una contraseña válida para la aplicación Dropbox.",
     "External storage" : "Almacenamiento externo",
-    "Location" : "Ubicación",
+    "Personal" : "Personal",
+    "Grant access" : "Permitir acceso",
+    "Access granted" : "Acceso permitido",
+    "Saved" : "Guardado",
+    "None" : "Ninguno",
+    "Username" : "Nombre de usuario",
+    "Password" : "Contraseña",
+    "API key" : "clave API",
     "Port" : "Puerto",
     "Region" : "Provincia",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Host" : "Servidor",
-    "Username" : "Nombre de usuario",
-    "Password" : "Contraseña",
+    "Location" : "Ubicación",
+    "ownCloud" : "ownCloud",
     "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",
+    "Add storage" : "Añadir almacenamiento",
     "Enable User External Storage" : "Habilitar almacenamiento de usuario externo"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/es_CL.js b/apps/files_external/l10n/es_CL.js
index e2936ebb415..6ab87d23bc8 100644
--- a/apps/files_external/l10n/es_CL.js
+++ b/apps/files_external/l10n/es_CL.js
@@ -1,10 +1,10 @@
 OC.L10N.register(
     "files_external",
     {
+    "Personal" : "Personal",
     "Username" : "Usuario",
     "Password" : "Clave",
     "Share" : "Compartir",
-    "Personal" : "Personal",
     "Folder name" : "Nombre del directorio"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/es_CL.json b/apps/files_external/l10n/es_CL.json
index 3c16c6b5124..e2aa9b9adda 100644
--- a/apps/files_external/l10n/es_CL.json
+++ b/apps/files_external/l10n/es_CL.json
@@ -1,8 +1,8 @@
 { "translations": {
+    "Personal" : "Personal",
     "Username" : "Usuario",
     "Password" : "Clave",
     "Share" : "Compartir",
-    "Personal" : "Personal",
     "Folder name" : "Nombre del directorio"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/es_MX.js b/apps/files_external/l10n/es_MX.js
index a51d157cd89..a8d1dea1a09 100644
--- a/apps/files_external/l10n/es_MX.js
+++ b/apps/files_external/l10n/es_MX.js
@@ -1,26 +1,25 @@
 OC.L10N.register(
     "files_external",
     {
-    "Please provide a valid Dropbox app key and secret." : "Por favor, proporcione un una clave válida de la app Dropbox y una clave secreta.",
     "External storage" : "Almacenamiento externo",
-    "Location" : "Ubicación",
-    "Port" : "Puerto",
-    "Host" : "Servidor",
+    "Personal" : "Personal",
+    "Grant access" : "Conceder acceso",
+    "Access granted" : "Acceso concedido",
     "Username" : "Nombre de usuario",
     "Password" : "Contraseña",
-    "Share" : "Compartir",
+    "API key" : "clave API",
+    "Port" : "Puerto",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
-    "Access granted" : "Acceso concedido",
-    "Error configuring Dropbox storage" : "Error configurando el almacenamiento de Dropbox",
-    "Grant access" : "Conceder acceso",
-    "Error configuring Google Drive storage" : "Error configurando el almacenamiento de Google Drive",
-    "Personal" : "Personal",
+    "Host" : "Servidor",
+    "Location" : "Ubicación",
+    "Share" : "Compartir",
     "Name" : "Nombre",
     "External Storage" : "Almacenamiento externo",
     "Folder name" : "Nombre de la carpeta",
     "Configuration" : "Configuración",
-    "Add storage" : "Añadir almacenamiento",
     "Delete" : "Eliminar",
+    "Add storage" : "Añadir almacenamiento",
     "Enable User External Storage" : "Habilitar almacenamiento externo de usuario"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/es_MX.json b/apps/files_external/l10n/es_MX.json
index 4a4bccdefe4..3fdea60b775 100644
--- a/apps/files_external/l10n/es_MX.json
+++ b/apps/files_external/l10n/es_MX.json
@@ -1,24 +1,23 @@
 { "translations": {
-    "Please provide a valid Dropbox app key and secret." : "Por favor, proporcione un una clave válida de la app Dropbox y una clave secreta.",
     "External storage" : "Almacenamiento externo",
-    "Location" : "Ubicación",
-    "Port" : "Puerto",
-    "Host" : "Servidor",
+    "Personal" : "Personal",
+    "Grant access" : "Conceder acceso",
+    "Access granted" : "Acceso concedido",
     "Username" : "Nombre de usuario",
     "Password" : "Contraseña",
-    "Share" : "Compartir",
+    "API key" : "clave API",
+    "Port" : "Puerto",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
-    "Access granted" : "Acceso concedido",
-    "Error configuring Dropbox storage" : "Error configurando el almacenamiento de Dropbox",
-    "Grant access" : "Conceder acceso",
-    "Error configuring Google Drive storage" : "Error configurando el almacenamiento de Google Drive",
-    "Personal" : "Personal",
+    "Host" : "Servidor",
+    "Location" : "Ubicación",
+    "Share" : "Compartir",
     "Name" : "Nombre",
     "External Storage" : "Almacenamiento externo",
     "Folder name" : "Nombre de la carpeta",
     "Configuration" : "Configuración",
-    "Add storage" : "Añadir almacenamiento",
     "Delete" : "Eliminar",
+    "Add storage" : "Añadir almacenamiento",
     "Enable User External Storage" : "Habilitar almacenamiento externo de usuario"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/et_EE.js b/apps/files_external/l10n/et_EE.js
index bc43609aca2..50102a5d2eb 100644
--- a/apps/files_external/l10n/et_EE.js
+++ b/apps/files_external/l10n/et_EE.js
@@ -1,59 +1,18 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Tellimustõendi hankimine ebaõnnestus. Veendu, et Su Dropboxi rakendi võti (key) ja saladus (secret) on korrektsed.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Ligipääsutõendi hankimine ebaõnnestus. Veendu, et Su Dropboxi rakendi võti (key) ja saladus (secret) on korrektsed.",
-    "Please provide a valid Dropbox app key and secret." : "Palun sisesta korrektne Dropboxi rakenduse võti ja salasõna.",
     "Step 1 failed. Exception: %s" : "Samm 1 ebaõnnestus. Erind: %s",
     "Step 2 failed. Exception: %s" : "Samm 2 ebaõnnestus. Erind: %s",
     "External storage" : "Väline andmehoidla",
-    "Local" : "Kohalik",
-    "Location" : "Asukoht",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Võti",
-    "Secret" : "Salasõna",
-    "Bucket" : "Korv",
-    "Amazon S3 and compliant" : "Amazon S3 ja ühilduv",
-    "Access Key" : "Ligipääsu võti",
-    "Secret Key" : "Salavõti",
-    "Hostname" : "Hostinimi",
-    "Port" : "Port",
-    "Region" : "Piirkond",
-    "Enable SSL" : "SSL-i kasutamine",
-    "Enable Path Style" : "Luba otsingtee stiilis",
-    "App key" : "Rakenduse võti",
-    "App secret" : "Rakenduse salasõna",
-    "Host" : "Host",
-    "Username" : "Kasutajanimi",
-    "Password" : "Parool",
-    "Remote subfolder" : "Mujahl olev alamkaust",
-    "Secure ftps://" : "Turvaline ftps://",
-    "Client ID" : "Kliendi ID",
-    "Client secret" : "Kliendi salasõna",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Regioon (valikuline OpenStack Object Storage puhul)",
-    "API Key (required for Rackspace Cloud Files)" : "API võti (vajalik Rackspace Cloud Files puhul)",
-    "Tenantname (required for OpenStack Object Storage)" : "Rendinimi (tenantname , vajalik OpenStack Object Storage puhul)",
-    "Password (required for OpenStack Object Storage)" : "Parool (vajalik OpenStack Object Storage puhul)",
-    "Service Name (required for OpenStack Object Storage)" : "Teenuse nimi (vajalik OpenStack Object Storage puhul)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Tuvastuse URL lõpp-punkt (vajalik OpenStack Object Storage puhul)",
-    "Timeout of HTTP requests in seconds" : "HTTP päringute aegumine sekundites",
-    "Share" : "Jaga",
-    "SMB / CIFS using OC login" : "SMB / CIFS kasutades OC logimist",
-    "Username as share" : "Kasutajanimi kui jagamine",
-    "URL" : "URL",
-    "Secure https://" : "Turvaline https://",
-    "SFTP with secret key login" : "SFTP koos salajase võtmega logimisega",
-    "Public key" : "Avalik võti",
     "Storage with id \"%i\" not found" : "Salvestuskohta ID-ga \"%i\" ei leitud",
     "Invalid mount point" : "Vigane ühenduspunkt",
     "Invalid storage backend \"%s\"" : "Vigane salvestuskoha taustsüsteem \"%s\"",
-    "Access granted" : "Ligipääs on antud",
-    "Error configuring Dropbox storage" : "Viga Dropboxi salvestusruumi seadistamisel",
-    "Grant access" : "Anna ligipääs",
-    "Error configuring Google Drive storage" : "Viga Google Drive'i salvestusruumi seadistamisel",
     "Personal" : "Isiklik",
     "System" : "Süsteem",
+    "Grant access" : "Anna ligipääs",
+    "Access granted" : "Ligipääs on antud",
+    "Generate keys" : "Loo võtmed",
+    "Error generating key pair" : "Viga võtmepaari loomisel",
     "Enable encryption" : "Luba krüpteerimine",
     "Enable previews" : "Luba eelvaated",
     "Check for changes" : "Otsi uuendusi",
@@ -63,10 +22,37 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Kõik kasutajad. Kirjuta, et valida kasutaja või grupp.",
     "(group)" : "(grupp)",
     "Saved" : "Salvestatud",
-    "Generate keys" : "Loo võtmed",
-    "Error generating key pair" : "Viga võtmepaari loomisel",
+    "None" : "Pole",
+    "App key" : "Rakenduse võti",
+    "App secret" : "Rakenduse salasõna",
+    "Client ID" : "Kliendi ID",
+    "Client secret" : "Kliendi salasõna",
+    "Username" : "Kasutajanimi",
+    "Password" : "Parool",
+    "API key" : "API võti",
+    "Public key" : "Avalik võti",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Korv",
+    "Hostname" : "Hostinimi",
+    "Port" : "Port",
+    "Region" : "Piirkond",
+    "Enable SSL" : "SSL-i kasutamine",
+    "Enable Path Style" : "Luba otsingtee stiilis",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Mujahl olev alamkaust",
+    "Secure https://" : "Turvaline https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Host",
+    "Secure ftps://" : "Turvaline ftps://",
+    "Local" : "Kohalik",
+    "Location" : "Asukoht",
+    "ownCloud" : "ownCloud",
+    "Root" : "Juur",
+    "Share" : "Jaga",
+    "Username as share" : "Kasutajanimi kui jagamine",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Märkus:</b>",
-    "and" : "ja",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Märkus:</b> cURL tugi puudub PHP paigalduses. FTP %s hoidla ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata cURL tugi.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Märkus:</b> FTP tugi puudub PHP paigalduses. FTP %s hoidla ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata FTP tugi.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Märkus:</b> \"%s\" pole paigaldatud. Hoidla %s ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata vajalik tugi.",
@@ -79,9 +65,9 @@ OC.L10N.register(
     "Folder name" : "Kausta nimi",
     "Configuration" : "Seadistamine",
     "Available for" : "Saadaval",
-    "Add storage" : "Lisa andmehoidla",
     "Advanced settings" : "Lisavalikud",
     "Delete" : "Kustuta",
+    "Add storage" : "Lisa andmehoidla",
     "Enable User External Storage" : "Luba kasutajatele väline salvestamine",
     "Allow users to mount the following external storage" : "Võimalda kasutajatel ühendada järgmist välist andmehoidlat"
 },
diff --git a/apps/files_external/l10n/et_EE.json b/apps/files_external/l10n/et_EE.json
index 4870b55afb3..d307bc9c214 100644
--- a/apps/files_external/l10n/et_EE.json
+++ b/apps/files_external/l10n/et_EE.json
@@ -1,57 +1,16 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Tellimustõendi hankimine ebaõnnestus. Veendu, et Su Dropboxi rakendi võti (key) ja saladus (secret) on korrektsed.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Ligipääsutõendi hankimine ebaõnnestus. Veendu, et Su Dropboxi rakendi võti (key) ja saladus (secret) on korrektsed.",
-    "Please provide a valid Dropbox app key and secret." : "Palun sisesta korrektne Dropboxi rakenduse võti ja salasõna.",
     "Step 1 failed. Exception: %s" : "Samm 1 ebaõnnestus. Erind: %s",
     "Step 2 failed. Exception: %s" : "Samm 2 ebaõnnestus. Erind: %s",
     "External storage" : "Väline andmehoidla",
-    "Local" : "Kohalik",
-    "Location" : "Asukoht",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Võti",
-    "Secret" : "Salasõna",
-    "Bucket" : "Korv",
-    "Amazon S3 and compliant" : "Amazon S3 ja ühilduv",
-    "Access Key" : "Ligipääsu võti",
-    "Secret Key" : "Salavõti",
-    "Hostname" : "Hostinimi",
-    "Port" : "Port",
-    "Region" : "Piirkond",
-    "Enable SSL" : "SSL-i kasutamine",
-    "Enable Path Style" : "Luba otsingtee stiilis",
-    "App key" : "Rakenduse võti",
-    "App secret" : "Rakenduse salasõna",
-    "Host" : "Host",
-    "Username" : "Kasutajanimi",
-    "Password" : "Parool",
-    "Remote subfolder" : "Mujahl olev alamkaust",
-    "Secure ftps://" : "Turvaline ftps://",
-    "Client ID" : "Kliendi ID",
-    "Client secret" : "Kliendi salasõna",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Regioon (valikuline OpenStack Object Storage puhul)",
-    "API Key (required for Rackspace Cloud Files)" : "API võti (vajalik Rackspace Cloud Files puhul)",
-    "Tenantname (required for OpenStack Object Storage)" : "Rendinimi (tenantname , vajalik OpenStack Object Storage puhul)",
-    "Password (required for OpenStack Object Storage)" : "Parool (vajalik OpenStack Object Storage puhul)",
-    "Service Name (required for OpenStack Object Storage)" : "Teenuse nimi (vajalik OpenStack Object Storage puhul)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Tuvastuse URL lõpp-punkt (vajalik OpenStack Object Storage puhul)",
-    "Timeout of HTTP requests in seconds" : "HTTP päringute aegumine sekundites",
-    "Share" : "Jaga",
-    "SMB / CIFS using OC login" : "SMB / CIFS kasutades OC logimist",
-    "Username as share" : "Kasutajanimi kui jagamine",
-    "URL" : "URL",
-    "Secure https://" : "Turvaline https://",
-    "SFTP with secret key login" : "SFTP koos salajase võtmega logimisega",
-    "Public key" : "Avalik võti",
     "Storage with id \"%i\" not found" : "Salvestuskohta ID-ga \"%i\" ei leitud",
     "Invalid mount point" : "Vigane ühenduspunkt",
     "Invalid storage backend \"%s\"" : "Vigane salvestuskoha taustsüsteem \"%s\"",
-    "Access granted" : "Ligipääs on antud",
-    "Error configuring Dropbox storage" : "Viga Dropboxi salvestusruumi seadistamisel",
-    "Grant access" : "Anna ligipääs",
-    "Error configuring Google Drive storage" : "Viga Google Drive'i salvestusruumi seadistamisel",
     "Personal" : "Isiklik",
     "System" : "Süsteem",
+    "Grant access" : "Anna ligipääs",
+    "Access granted" : "Ligipääs on antud",
+    "Generate keys" : "Loo võtmed",
+    "Error generating key pair" : "Viga võtmepaari loomisel",
     "Enable encryption" : "Luba krüpteerimine",
     "Enable previews" : "Luba eelvaated",
     "Check for changes" : "Otsi uuendusi",
@@ -61,10 +20,37 @@
     "All users. Type to select user or group." : "Kõik kasutajad. Kirjuta, et valida kasutaja või grupp.",
     "(group)" : "(grupp)",
     "Saved" : "Salvestatud",
-    "Generate keys" : "Loo võtmed",
-    "Error generating key pair" : "Viga võtmepaari loomisel",
+    "None" : "Pole",
+    "App key" : "Rakenduse võti",
+    "App secret" : "Rakenduse salasõna",
+    "Client ID" : "Kliendi ID",
+    "Client secret" : "Kliendi salasõna",
+    "Username" : "Kasutajanimi",
+    "Password" : "Parool",
+    "API key" : "API võti",
+    "Public key" : "Avalik võti",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Korv",
+    "Hostname" : "Hostinimi",
+    "Port" : "Port",
+    "Region" : "Piirkond",
+    "Enable SSL" : "SSL-i kasutamine",
+    "Enable Path Style" : "Luba otsingtee stiilis",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Mujahl olev alamkaust",
+    "Secure https://" : "Turvaline https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Host",
+    "Secure ftps://" : "Turvaline ftps://",
+    "Local" : "Kohalik",
+    "Location" : "Asukoht",
+    "ownCloud" : "ownCloud",
+    "Root" : "Juur",
+    "Share" : "Jaga",
+    "Username as share" : "Kasutajanimi kui jagamine",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Märkus:</b>",
-    "and" : "ja",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Märkus:</b> cURL tugi puudub PHP paigalduses. FTP %s hoidla ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata cURL tugi.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Märkus:</b> FTP tugi puudub PHP paigalduses. FTP %s hoidla ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata FTP tugi.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Märkus:</b> \"%s\" pole paigaldatud. Hoidla %s ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata vajalik tugi.",
@@ -77,9 +63,9 @@
     "Folder name" : "Kausta nimi",
     "Configuration" : "Seadistamine",
     "Available for" : "Saadaval",
-    "Add storage" : "Lisa andmehoidla",
     "Advanced settings" : "Lisavalikud",
     "Delete" : "Kustuta",
+    "Add storage" : "Lisa andmehoidla",
     "Enable User External Storage" : "Luba kasutajatele väline salvestamine",
     "Allow users to mount the following external storage" : "Võimalda kasutajatel ühendada järgmist välist andmehoidlat"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/eu.js b/apps/files_external/l10n/eu.js
index b22205abdb2..199676d7269 100644
--- a/apps/files_external/l10n/eu.js
+++ b/apps/files_external/l10n/eu.js
@@ -1,59 +1,46 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Eskaera tokenen eskuratzeak huts egin du. Egiaztatu zure Dropbox app giltza eta sekretua zuzenak direla.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Sarrera tokenen eskuratzeak huts egin du. Egiaztatu zure Dropbox app giltza eta sekretua zuzenak direla.",
-    "Please provide a valid Dropbox app key and secret." : "Mesedez eman baliozkoa den Dropbox app giltza eta sekretua",
     "Step 1 failed. Exception: %s" : "1 Urratsak huts egin du. Salbuespena: %s",
     "Step 2 failed. Exception: %s" : "2 Urratsak huts egin du. Salbuespena: %s",
     "External storage" : "Kanpoko biltegiratzea",
-    "Local" : "Bertakoa",
-    "Location" : "Kokapena",
+    "Personal" : "Pertsonala",
+    "System" : "Sistema",
+    "Grant access" : "Baimendu sarrera",
+    "Access granted" : "Sarrera baimendua",
+    "All users. Type to select user or group." : "Erabiltzaile guztiak. Idatzi erabiltzaile edo taldea hautatzeko.",
+    "(group)" : "(taldea)",
+    "Saved" : "Gordeta",
+    "None" : "Ezer",
+    "App key" : "Aplikazio gakoa",
+    "App secret" : "App sekretua",
+    "Client ID" : "Bezero ID",
+    "Client secret" : "Bezeroaren Sekretua",
+    "Username" : "Erabiltzaile izena",
+    "Password" : "Pasahitza",
+    "API key" : "APIaren gakoa",
+    "Public key" : "Gako publikoa",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Gakoa",
-    "Secret" : "Sekretua",
-    "Amazon S3 and compliant" : "Amazon S3 eta baliokideak",
-    "Access Key" : "Sarbide gakoa",
-    "Secret Key" : "Giltza Sekretua",
     "Hostname" : "Ostalari izena",
     "Port" : "Portua",
     "Region" : "Eskualdea",
     "Enable SSL" : "Gaitu SSL",
     "Enable Path Style" : "Gaitu Bide Estiloa",
-    "App key" : "Aplikazio gakoa",
-    "App secret" : "App sekretua",
-    "Host" : "Ostalaria",
-    "Username" : "Erabiltzaile izena",
-    "Password" : "Pasahitza",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Remote subfolder" : "Urruneko azpikarpeta",
+    "Secure https://" : "https:// segurua",
+    "Dropbox" : "Dropbox",
+    "Host" : "Ostalaria",
     "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",
+    "Local" : "Bertakoa",
+    "Location" : "Kokapena",
+    "ownCloud" : "ownCloud",
+    "Root" : "Erroa",
     "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",
-    "Public key" : "Gako publikoa",
-    "Access granted" : "Sarrera baimendua",
-    "Error configuring Dropbox storage" : "Errore bat egon da Dropbox biltegiratzea konfiguratzean",
-    "Grant access" : "Baimendu sarrera",
-    "Error configuring Google Drive storage" : "Errore bat egon da Google Drive konfiguratzean",
-    "Personal" : "Pertsonala",
-    "System" : "Sistema",
-    "All users. Type to select user or group." : "Erabiltzaile guztiak. Idatzi erabiltzaile edo taldea hautatzeko.",
-    "(group)" : "(taldea)",
-    "Saved" : "Gordeta",
+    "OpenStack Object Storage" : "OpenStack Objektu Biltegiratzea",
     "<b>Note:</b> " : "<b>Oharra:</b>",
-    "and" : "eta",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Oharra:</b> :PHPko cURL euskarria ez dago instalatuta edo gaitua. Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Oharra:</b> :PHPko FTP euskarria ez dago instalatuta edo gaitua. Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Oharra:</b>\"%s\" euskarria ez dago instalatuta Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ",
@@ -64,8 +51,8 @@ OC.L10N.register(
     "Folder name" : "Karpetaren izena",
     "Configuration" : "Konfigurazioa",
     "Available for" : "Hauentzat eskuragarri",
-    "Add storage" : "Gehitu biltegiratzea",
     "Delete" : "Ezabatu",
+    "Add storage" : "Gehitu biltegiratzea",
     "Enable User External Storage" : "Gaitu erabiltzaileentzako kanpo biltegiratzea",
     "Allow users to mount the following external storage" : "Baimendu erabiltzaileak hurrengo kanpo biltegiratzeak muntatzen"
 },
diff --git a/apps/files_external/l10n/eu.json b/apps/files_external/l10n/eu.json
index 6f46c8004b6..f13311954f7 100644
--- a/apps/files_external/l10n/eu.json
+++ b/apps/files_external/l10n/eu.json
@@ -1,57 +1,44 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Eskaera tokenen eskuratzeak huts egin du. Egiaztatu zure Dropbox app giltza eta sekretua zuzenak direla.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Sarrera tokenen eskuratzeak huts egin du. Egiaztatu zure Dropbox app giltza eta sekretua zuzenak direla.",
-    "Please provide a valid Dropbox app key and secret." : "Mesedez eman baliozkoa den Dropbox app giltza eta sekretua",
     "Step 1 failed. Exception: %s" : "1 Urratsak huts egin du. Salbuespena: %s",
     "Step 2 failed. Exception: %s" : "2 Urratsak huts egin du. Salbuespena: %s",
     "External storage" : "Kanpoko biltegiratzea",
-    "Local" : "Bertakoa",
-    "Location" : "Kokapena",
+    "Personal" : "Pertsonala",
+    "System" : "Sistema",
+    "Grant access" : "Baimendu sarrera",
+    "Access granted" : "Sarrera baimendua",
+    "All users. Type to select user or group." : "Erabiltzaile guztiak. Idatzi erabiltzaile edo taldea hautatzeko.",
+    "(group)" : "(taldea)",
+    "Saved" : "Gordeta",
+    "None" : "Ezer",
+    "App key" : "Aplikazio gakoa",
+    "App secret" : "App sekretua",
+    "Client ID" : "Bezero ID",
+    "Client secret" : "Bezeroaren Sekretua",
+    "Username" : "Erabiltzaile izena",
+    "Password" : "Pasahitza",
+    "API key" : "APIaren gakoa",
+    "Public key" : "Gako publikoa",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Gakoa",
-    "Secret" : "Sekretua",
-    "Amazon S3 and compliant" : "Amazon S3 eta baliokideak",
-    "Access Key" : "Sarbide gakoa",
-    "Secret Key" : "Giltza Sekretua",
     "Hostname" : "Ostalari izena",
     "Port" : "Portua",
     "Region" : "Eskualdea",
     "Enable SSL" : "Gaitu SSL",
     "Enable Path Style" : "Gaitu Bide Estiloa",
-    "App key" : "Aplikazio gakoa",
-    "App secret" : "App sekretua",
-    "Host" : "Ostalaria",
-    "Username" : "Erabiltzaile izena",
-    "Password" : "Pasahitza",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Remote subfolder" : "Urruneko azpikarpeta",
+    "Secure https://" : "https:// segurua",
+    "Dropbox" : "Dropbox",
+    "Host" : "Ostalaria",
     "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",
+    "Local" : "Bertakoa",
+    "Location" : "Kokapena",
+    "ownCloud" : "ownCloud",
+    "Root" : "Erroa",
     "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",
-    "Public key" : "Gako publikoa",
-    "Access granted" : "Sarrera baimendua",
-    "Error configuring Dropbox storage" : "Errore bat egon da Dropbox biltegiratzea konfiguratzean",
-    "Grant access" : "Baimendu sarrera",
-    "Error configuring Google Drive storage" : "Errore bat egon da Google Drive konfiguratzean",
-    "Personal" : "Pertsonala",
-    "System" : "Sistema",
-    "All users. Type to select user or group." : "Erabiltzaile guztiak. Idatzi erabiltzaile edo taldea hautatzeko.",
-    "(group)" : "(taldea)",
-    "Saved" : "Gordeta",
+    "OpenStack Object Storage" : "OpenStack Objektu Biltegiratzea",
     "<b>Note:</b> " : "<b>Oharra:</b>",
-    "and" : "eta",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Oharra:</b> :PHPko cURL euskarria ez dago instalatuta edo gaitua. Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Oharra:</b> :PHPko FTP euskarria ez dago instalatuta edo gaitua. Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Oharra:</b>\"%s\" euskarria ez dago instalatuta Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ",
@@ -62,8 +49,8 @@
     "Folder name" : "Karpetaren izena",
     "Configuration" : "Konfigurazioa",
     "Available for" : "Hauentzat eskuragarri",
-    "Add storage" : "Gehitu biltegiratzea",
     "Delete" : "Ezabatu",
+    "Add storage" : "Gehitu biltegiratzea",
     "Enable User External Storage" : "Gaitu erabiltzaileentzako kanpo biltegiratzea",
     "Allow users to mount the following external storage" : "Baimendu erabiltzaileak hurrengo kanpo biltegiratzeak muntatzen"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/eu_ES.js b/apps/files_external/l10n/eu_ES.js
deleted file mode 100644
index 513edcb534e..00000000000
--- a/apps/files_external/l10n/eu_ES.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "files_external",
-    {
-    "Location" : "kokapena",
-    "Personal" : "Pertsonala",
-    "Delete" : "Ezabatu"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/eu_ES.json b/apps/files_external/l10n/eu_ES.json
deleted file mode 100644
index 149a30d1a7e..00000000000
--- a/apps/files_external/l10n/eu_ES.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "Location" : "kokapena",
-    "Personal" : "Pertsonala",
-    "Delete" : "Ezabatu"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files_external/l10n/fa.js b/apps/files_external/l10n/fa.js
index 066684383e8..1a3a06ba391 100644
--- a/apps/files_external/l10n/fa.js
+++ b/apps/files_external/l10n/fa.js
@@ -1,28 +1,29 @@
 OC.L10N.register(
     "files_external",
     {
-    "Please provide a valid Dropbox app key and secret." : "لطفا یک کلید و کد امنیتی صحیح دراپ باکس وارد کنید.",
     "External storage" : "حافظه خارجی",
-    "Location" : "محل",
+    "Personal" : "شخصی",
+    "Grant access" : " مجوز اعطا دسترسی",
+    "Access granted" : "مجوز دسترسی صادر شد",
+    "Saved" : "ذخیره شد",
+    "None" : "هیچ‌کدام",
+    "Username" : "نام کاربری",
+    "Password" : "گذرواژه",
+    "API key" : "کلید API ",
     "Port" : "درگاه",
     "Region" : "ناحیه",
+    "WebDAV" : "WebDAV",
+    "URL" : "آدرس",
     "Host" : "میزبانی",
-    "Username" : "نام کاربری",
-    "Password" : "گذرواژه",
+    "Location" : "محل",
+    "ownCloud" : "ownCloud",
     "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" : "حذف",
+    "Add storage" : "اضافه کردن حافظه",
     "Enable User External Storage" : "فعال سازی حافظه خارجی کاربر"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files_external/l10n/fa.json b/apps/files_external/l10n/fa.json
index 21bd2c63b59..79a599d7390 100644
--- a/apps/files_external/l10n/fa.json
+++ b/apps/files_external/l10n/fa.json
@@ -1,26 +1,27 @@
 { "translations": {
-    "Please provide a valid Dropbox app key and secret." : "لطفا یک کلید و کد امنیتی صحیح دراپ باکس وارد کنید.",
     "External storage" : "حافظه خارجی",
-    "Location" : "محل",
+    "Personal" : "شخصی",
+    "Grant access" : " مجوز اعطا دسترسی",
+    "Access granted" : "مجوز دسترسی صادر شد",
+    "Saved" : "ذخیره شد",
+    "None" : "هیچ‌کدام",
+    "Username" : "نام کاربری",
+    "Password" : "گذرواژه",
+    "API key" : "کلید API ",
     "Port" : "درگاه",
     "Region" : "ناحیه",
+    "WebDAV" : "WebDAV",
+    "URL" : "آدرس",
     "Host" : "میزبانی",
-    "Username" : "نام کاربری",
-    "Password" : "گذرواژه",
+    "Location" : "محل",
+    "ownCloud" : "ownCloud",
     "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" : "حذف",
+    "Add storage" : "اضافه کردن حافظه",
     "Enable User External Storage" : "فعال سازی حافظه خارجی کاربر"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/fi.js b/apps/files_external/l10n/fi.js
deleted file mode 100644
index eaa9b89fc04..00000000000
--- a/apps/files_external/l10n/fi.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files_external",
-    {
-    "Username" : "Käyttäjätunnus",
-    "Password" : "Salasana",
-    "URL" : "URL",
-    "Delete" : "Poista"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/fi.json b/apps/files_external/l10n/fi.json
deleted file mode 100644
index 8a702552ca1..00000000000
--- a/apps/files_external/l10n/fi.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "Username" : "Käyttäjätunnus",
-    "Password" : "Salasana",
-    "URL" : "URL",
-    "Delete" : "Poista"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files_external/l10n/fi_FI.js b/apps/files_external/l10n/fi_FI.js
index 430702d686a..2243f5f5526 100644
--- a/apps/files_external/l10n/fi_FI.js
+++ b/apps/files_external/l10n/fi_FI.js
@@ -1,51 +1,21 @@
 OC.L10N.register(
     "files_external",
     {
-    "Please provide a valid Dropbox app key and secret." : "Anna kelvollinen Dropbox-sovellusavain ja salainen vastaus.",
     "Step 1 failed. Exception: %s" : "Vaihe 1 epäonnistui. Poikkeus: %s",
     "Step 2 failed. Exception: %s" : "Vaihe 2 epäonnistui. Poikkeus: %s",
     "External storage" : "Ulkoinen tallennustila",
-    "Local" : "Paikallinen",
-    "Location" : "Sijainti",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Avain",
-    "Secret" : "Salaisuus",
-    "Amazon S3 and compliant" : "Amazon S3 ja yhteensopivat",
-    "Access Key" : "Käyttöavain",
-    "Secret Key" : "Sala-avain",
-    "Port" : "Portti",
-    "Region" : "Alue",
-    "Enable SSL" : "Käytä SSL:ää",
-    "App key" : "Sovellusavain",
-    "App secret" : "Sovellussalaisuus",
-    "Host" : "Isäntä",
-    "Username" : "Käyttäjätunnus",
-    "Password" : "Salasana",
-    "Remote subfolder" : "Etäalikansio",
-    "Secure ftps://" : "Salattu ftps://",
-    "Client ID" : "Asiakkaan tunniste",
-    "Client secret" : "Asiakassalaisuus",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Alue (valinnainen OpenStack Object Storagen käyttöön)",
-    "API Key (required for Rackspace Cloud Files)" : "API-avain (vaaditaan Rackspace Cloud Filesin käyttöön)",
-    "Tenantname (required for OpenStack Object Storage)" : "Vuokralaisnimi (vaaditaan OpenStack Object Storagen käyttöön)",
-    "Password (required for OpenStack Object Storage)" : "Salasana (vaaditaan OpenStack Object Storagen käyttöön)",
-    "Service Name (required for OpenStack Object Storage)" : "Palvelun nimi (vaaditaan OpenStack Object Storagen käyttöön)",
-    "Timeout of HTTP requests in seconds" : "HTTP-pyyntöjen aikakatkaisu sekunneissa",
-    "Share" : "Jaa",
-    "SMB / CIFS using OC login" : "SMB / CIFS käyttäen OC-kirjautumista",
-    "Username as share" : "Käyttäjänimi jakona",
-    "URL" : "Verkko-osoite",
-    "Secure https://" : "Salattu https://",
-    "Public key" : "Julkinen avain",
+    "Storage with id \"%i\" not found" : "Tallennustilaa tunnisteella \"%i\" ei löytynyt",
     "Invalid mount point" : "Virheellinen liitoskohta",
-    "Access granted" : "Pääsy sallittu",
-    "Error configuring Dropbox storage" : "Virhe Dropbox levyn asetuksia tehtäessä",
-    "Grant access" : "Salli pääsy",
-    "Error configuring Google Drive storage" : "Virhe Google Drive levyn asetuksia tehtäessä",
     "Personal" : "Henkilökohtainen",
     "System" : "Järjestelmä",
+    "Grant access" : "Salli pääsy",
+    "Access granted" : "Pääsy sallittu",
+    "Error configuring OAuth1" : "Virhe OAuth1:n asetuksia tehdessä",
+    "Error configuring OAuth2" : "Virhe OAuth2:n asetuksia tehdessä",
+    "Generate keys" : "Luo avaimet",
+    "Error generating key pair" : "Virhe luotaessa avainparia",
     "Enable encryption" : "Käytä salausta",
+    "Enable previews" : "Käytä esikatseluja",
     "Check for changes" : "Tarkista muutokset",
     "Never" : "Ei koskaan",
     "Once every direct access" : "Kerran aina suoran käytön yhteydessä",
@@ -53,10 +23,43 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Kaikki käyttäjät. Kirjoita valitaksesi käyttäjän tai ryhmän.",
     "(group)" : "(ryhmä)",
     "Saved" : "Tallennettu",
-    "Generate keys" : "Luo avaimet",
-    "Error generating key pair" : "Virhe luotaessa avainparia",
+    "None" : "Ei mitään",
+    "OAuth1" : "OAuth1",
+    "App key" : "Sovellusavain",
+    "App secret" : "Sovellussalaisuus",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "Asiakkaan tunniste",
+    "Client secret" : "Asiakassalaisuus",
+    "OpenStack" : "OpenStack",
+    "Username" : "Käyttäjätunnus",
+    "Password" : "Salasana",
+    "API key" : "API-avain",
+    "Username and password" : "Käyttäjätunnus ja salasana",
+    "RSA public key" : "Julkinen RSA-avain",
+    "Public key" : "Julkinen avain",
+    "Amazon S3" : "Amazon S3",
+    "Port" : "Portti",
+    "Region" : "Alue",
+    "Enable SSL" : "Käytä SSL:ää",
+    "WebDAV" : "WebDAV",
+    "URL" : "Verkko-osoite",
+    "Remote subfolder" : "Etäalikansio",
+    "Secure https://" : "Salattu https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Isäntä",
+    "Secure ftps://" : "Salattu ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Paikallinen",
+    "Location" : "Sijainti",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Jaa",
+    "Username as share" : "Käyttäjänimi jakona",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Service name" : "Palvelun nimi",
     "<b>Note:</b> " : "<b>Huomio:</b> ",
-    "and" : "ja",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Huomio:</b> PHP:n cURL-tuki ei ole käytössä tai sitä ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan cURL-tuki käyttöön.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Huomio:</b> PHP:n FTP-tuki ei ole käytössä tai sitä ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan FTP-tuki käyttöön.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Huomio:</b> \"%s\" ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää asentamaan puuttuva kohde.",
@@ -66,11 +69,12 @@ OC.L10N.register(
     "Storage type" : "Tallennustilan tyyppi",
     "External Storage" : "Erillinen tallennusväline",
     "Folder name" : "Kansion nimi",
+    "Authentication" : "Tunnistautuminen",
     "Configuration" : "Asetukset",
     "Available for" : "Saatavuus",
-    "Add storage" : "Lisää tallennustila",
     "Advanced settings" : "Lisäasetukset",
     "Delete" : "Poista",
+    "Add storage" : "Lisää tallennustila",
     "Enable User External Storage" : "Ota käyttöön ulkopuoliset tallennuspaikat",
     "Allow users to mount the following external storage" : "Salli käyttäjien liittää seuraavat erilliset tallennusvälineet"
 },
diff --git a/apps/files_external/l10n/fi_FI.json b/apps/files_external/l10n/fi_FI.json
index 1f3bf46423e..b629fad87c6 100644
--- a/apps/files_external/l10n/fi_FI.json
+++ b/apps/files_external/l10n/fi_FI.json
@@ -1,49 +1,19 @@
 { "translations": {
-    "Please provide a valid Dropbox app key and secret." : "Anna kelvollinen Dropbox-sovellusavain ja salainen vastaus.",
     "Step 1 failed. Exception: %s" : "Vaihe 1 epäonnistui. Poikkeus: %s",
     "Step 2 failed. Exception: %s" : "Vaihe 2 epäonnistui. Poikkeus: %s",
     "External storage" : "Ulkoinen tallennustila",
-    "Local" : "Paikallinen",
-    "Location" : "Sijainti",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Avain",
-    "Secret" : "Salaisuus",
-    "Amazon S3 and compliant" : "Amazon S3 ja yhteensopivat",
-    "Access Key" : "Käyttöavain",
-    "Secret Key" : "Sala-avain",
-    "Port" : "Portti",
-    "Region" : "Alue",
-    "Enable SSL" : "Käytä SSL:ää",
-    "App key" : "Sovellusavain",
-    "App secret" : "Sovellussalaisuus",
-    "Host" : "Isäntä",
-    "Username" : "Käyttäjätunnus",
-    "Password" : "Salasana",
-    "Remote subfolder" : "Etäalikansio",
-    "Secure ftps://" : "Salattu ftps://",
-    "Client ID" : "Asiakkaan tunniste",
-    "Client secret" : "Asiakassalaisuus",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Alue (valinnainen OpenStack Object Storagen käyttöön)",
-    "API Key (required for Rackspace Cloud Files)" : "API-avain (vaaditaan Rackspace Cloud Filesin käyttöön)",
-    "Tenantname (required for OpenStack Object Storage)" : "Vuokralaisnimi (vaaditaan OpenStack Object Storagen käyttöön)",
-    "Password (required for OpenStack Object Storage)" : "Salasana (vaaditaan OpenStack Object Storagen käyttöön)",
-    "Service Name (required for OpenStack Object Storage)" : "Palvelun nimi (vaaditaan OpenStack Object Storagen käyttöön)",
-    "Timeout of HTTP requests in seconds" : "HTTP-pyyntöjen aikakatkaisu sekunneissa",
-    "Share" : "Jaa",
-    "SMB / CIFS using OC login" : "SMB / CIFS käyttäen OC-kirjautumista",
-    "Username as share" : "Käyttäjänimi jakona",
-    "URL" : "Verkko-osoite",
-    "Secure https://" : "Salattu https://",
-    "Public key" : "Julkinen avain",
+    "Storage with id \"%i\" not found" : "Tallennustilaa tunnisteella \"%i\" ei löytynyt",
     "Invalid mount point" : "Virheellinen liitoskohta",
-    "Access granted" : "Pääsy sallittu",
-    "Error configuring Dropbox storage" : "Virhe Dropbox levyn asetuksia tehtäessä",
-    "Grant access" : "Salli pääsy",
-    "Error configuring Google Drive storage" : "Virhe Google Drive levyn asetuksia tehtäessä",
     "Personal" : "Henkilökohtainen",
     "System" : "Järjestelmä",
+    "Grant access" : "Salli pääsy",
+    "Access granted" : "Pääsy sallittu",
+    "Error configuring OAuth1" : "Virhe OAuth1:n asetuksia tehdessä",
+    "Error configuring OAuth2" : "Virhe OAuth2:n asetuksia tehdessä",
+    "Generate keys" : "Luo avaimet",
+    "Error generating key pair" : "Virhe luotaessa avainparia",
     "Enable encryption" : "Käytä salausta",
+    "Enable previews" : "Käytä esikatseluja",
     "Check for changes" : "Tarkista muutokset",
     "Never" : "Ei koskaan",
     "Once every direct access" : "Kerran aina suoran käytön yhteydessä",
@@ -51,10 +21,43 @@
     "All users. Type to select user or group." : "Kaikki käyttäjät. Kirjoita valitaksesi käyttäjän tai ryhmän.",
     "(group)" : "(ryhmä)",
     "Saved" : "Tallennettu",
-    "Generate keys" : "Luo avaimet",
-    "Error generating key pair" : "Virhe luotaessa avainparia",
+    "None" : "Ei mitään",
+    "OAuth1" : "OAuth1",
+    "App key" : "Sovellusavain",
+    "App secret" : "Sovellussalaisuus",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "Asiakkaan tunniste",
+    "Client secret" : "Asiakassalaisuus",
+    "OpenStack" : "OpenStack",
+    "Username" : "Käyttäjätunnus",
+    "Password" : "Salasana",
+    "API key" : "API-avain",
+    "Username and password" : "Käyttäjätunnus ja salasana",
+    "RSA public key" : "Julkinen RSA-avain",
+    "Public key" : "Julkinen avain",
+    "Amazon S3" : "Amazon S3",
+    "Port" : "Portti",
+    "Region" : "Alue",
+    "Enable SSL" : "Käytä SSL:ää",
+    "WebDAV" : "WebDAV",
+    "URL" : "Verkko-osoite",
+    "Remote subfolder" : "Etäalikansio",
+    "Secure https://" : "Salattu https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Isäntä",
+    "Secure ftps://" : "Salattu ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Paikallinen",
+    "Location" : "Sijainti",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Jaa",
+    "Username as share" : "Käyttäjänimi jakona",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Service name" : "Palvelun nimi",
     "<b>Note:</b> " : "<b>Huomio:</b> ",
-    "and" : "ja",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Huomio:</b> PHP:n cURL-tuki ei ole käytössä tai sitä ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan cURL-tuki käyttöön.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Huomio:</b> PHP:n FTP-tuki ei ole käytössä tai sitä ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan FTP-tuki käyttöön.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Huomio:</b> \"%s\" ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää asentamaan puuttuva kohde.",
@@ -64,11 +67,12 @@
     "Storage type" : "Tallennustilan tyyppi",
     "External Storage" : "Erillinen tallennusväline",
     "Folder name" : "Kansion nimi",
+    "Authentication" : "Tunnistautuminen",
     "Configuration" : "Asetukset",
     "Available for" : "Saatavuus",
-    "Add storage" : "Lisää tallennustila",
     "Advanced settings" : "Lisäasetukset",
     "Delete" : "Poista",
+    "Add storage" : "Lisää tallennustila",
     "Enable User External Storage" : "Ota käyttöön ulkopuoliset tallennuspaikat",
     "Allow users to mount the following external storage" : "Salli käyttäjien liittää seuraavat erilliset tallennusvälineet"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/fr.js b/apps/files_external/l10n/fr.js
index 9877d2b2407..87c7f63bfb5 100644
--- a/apps/files_external/l10n/fr.js
+++ b/apps/files_external/l10n/fr.js
@@ -1,59 +1,27 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "La récupération des jetons d’authentification a échoué. Veuillez vérifier votre clé d'application Dropbox ainsi que le mot de passe.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "La requête d’accès aux jetons d’authentification a échoué. Veuillez vérifier votre App-Key Dropbox ainsi que le mot de passe.",
-    "Please provide a valid Dropbox app key and secret." : "Veuillez fournir une clé d'application (app key) ainsi qu'un mot de passe valides.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "L'obtention des jetons de requête a échoué. Vérifiez que votre clé d'application et votre mot de passe sont corrects.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "L'obtention des jetons d'accès a échoué. Vérifiez que votre clé d'application et votre mot de passe sont corrects.",
+    "Please provide a valid app key and secret." : "Veuillez fournir une clé d'application et un mot de passe valides.",
     "Step 1 failed. Exception: %s" : "L’étape 1 a échoué. Erreur : %s",
     "Step 2 failed. Exception: %s" : "L’étape 2 a échoué. Erreur : %s",
     "External storage" : "Stockage externe",
-    "Local" : "Local",
-    "Location" : "Emplacement",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Clé",
-    "Secret" : "Secret",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 et compatibles",
-    "Access Key" : "Clé d'accès",
-    "Secret Key" : "Clé secrète",
-    "Hostname" : "Nom de l'hôte",
-    "Port" : "Port",
-    "Region" : "Région",
-    "Enable SSL" : "Activer SSL",
-    "Enable Path Style" : "Accès par path",
-    "App key" : "App key",
-    "App secret" : "App secret",
-    "Host" : "Hôte",
-    "Username" : "Nom d'utilisateur",
-    "Password" : "Mot de passe",
-    "Remote subfolder" : "Sous-dossier distant",
-    "Secure ftps://" : "Sécurisation ftps://",
-    "Client ID" : "ID Client",
-    "Client secret" : "Secret client",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Région (optionnel pour OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Clé API (requis pour Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (requis pour le stockage OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Mot de passe (requis pour OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nom du service (requis pour le stockage OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL du point d'accès d'identité (requis pour le stockage OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Délai d'attente maximal des requêtes HTTP en secondes",
-    "Share" : "Partage",
-    "SMB / CIFS using OC login" : "SMB / CIFS en utilisant les identifiants OC",
-    "Username as share" : "Nom d'utilisateur comme nom de partage",
-    "URL" : "URL",
-    "Secure https://" : "Sécurisation https://",
-    "SFTP with secret key login" : "SFTP avec identification par clé",
-    "Public key" : "Clef publique",
     "Storage with id \"%i\" not found" : "Stockage avec l'id \"%i\" non trouvé",
+    "Invalid backend or authentication mechanism class" : "Système de stockage ou méthode d'authentification non valable",
     "Invalid mount point" : "Point de montage non valide",
+    "Objectstore forbidden" : "\"Objectstore\" interdit",
     "Invalid storage backend \"%s\"" : "Service de stockage non valide : \"%s\"",
-    "Access granted" : "Accès autorisé",
-    "Error configuring Dropbox storage" : "Erreur lors de la configuration du stockage Dropbox",
-    "Grant access" : "Autoriser l'accès",
-    "Error configuring Google Drive storage" : "Erreur lors de la configuration du stockage Google Drive",
+    "Unsatisfied backend parameters" : "Paramètres manquants pour le service",
+    "Unsatisfied authentication mechanism parameters" : "Paramètres manquants pour la méthode d'authentification",
     "Personal" : "Personnel",
     "System" : "Système",
+    "Grant access" : "Autoriser l'accès",
+    "Access granted" : "Accès autorisé",
+    "Error configuring OAuth1" : "Erreur lors de la configuration de OAuth1",
+    "Error configuring OAuth2" : "Erreur lors de la configuration de OAuth2",
+    "Generate keys" : "Générer des clés",
+    "Error generating key pair" : "Erreur lors de la génération des clés",
     "Enable encryption" : "Activer le chiffrement",
     "Enable previews" : "Activer les prévisualisations",
     "Check for changes" : "Rechercher les modifications",
@@ -63,10 +31,48 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Tous les utilisateurs. Cliquez ici pour restreindre.",
     "(group)" : "(groupe)",
     "Saved" : "Sauvegardé",
-    "Generate keys" : "Générer des clés",
-    "Error generating key pair" : "Erreur lors de la génération des clés",
+    "Access key" : "Clé d'accès",
+    "Secret key" : "Clé secrète",
+    "Builtin" : "inclus",
+    "None" : "Aucun",
+    "OAuth1" : "OAuth1",
+    "App key" : "App key",
+    "App secret" : "App secret",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "ID Client",
+    "Client secret" : "Secret client",
+    "Username" : "Nom d'utilisateur",
+    "Password" : "Mot de passe",
+    "API key" : "Clé API",
+    "Username and password" : "Nom d'utilisateur et mot de passe",
+    "Session credentials" : "Informations d'identification de session",
+    "Public key" : "Clef publique",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Nom de l'hôte",
+    "Port" : "Port",
+    "Region" : "Région",
+    "Enable SSL" : "Activer SSL",
+    "Enable Path Style" : "Accès par path",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Sous-dossier distant",
+    "Secure https://" : "Sécurisation https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Hôte",
+    "Secure ftps://" : "Sécurisation ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Local",
+    "Location" : "Emplacement",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Root",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Partage",
+    "Username as share" : "Nom d'utilisateur comme nom de partage",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Attention :</b>",
-    "and" : " et ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention :</b> La prise en charge de cURL par PHP n'est pas activée ou installée. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention : </b> La prise en charge du FTP par PHP n'est pas activée ou installée. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention : </b> \"%s\" n'est pas installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
@@ -77,11 +83,12 @@ OC.L10N.register(
     "Scope" : "Portée",
     "External Storage" : "Stockage externe",
     "Folder name" : "Nom du dossier",
+    "Authentication" : "Authentification",
     "Configuration" : "Configuration",
     "Available for" : "Disponible pour",
-    "Add storage" : "Ajouter un support de stockage",
     "Advanced settings" : "Paramètres avancés",
     "Delete" : "Supprimer",
+    "Add storage" : "Ajouter un support de stockage",
     "Enable User External Storage" : "Autoriser les utilisateurs à ajouter des stockages externes",
     "Allow users to mount the following external storage" : "Autoriser les utilisateurs à monter les stockages externes suivants"
 },
diff --git a/apps/files_external/l10n/fr.json b/apps/files_external/l10n/fr.json
index 22c5106b44a..dee041e3546 100644
--- a/apps/files_external/l10n/fr.json
+++ b/apps/files_external/l10n/fr.json
@@ -1,57 +1,25 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "La récupération des jetons d’authentification a échoué. Veuillez vérifier votre clé d'application Dropbox ainsi que le mot de passe.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "La requête d’accès aux jetons d’authentification a échoué. Veuillez vérifier votre App-Key Dropbox ainsi que le mot de passe.",
-    "Please provide a valid Dropbox app key and secret." : "Veuillez fournir une clé d'application (app key) ainsi qu'un mot de passe valides.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "L'obtention des jetons de requête a échoué. Vérifiez que votre clé d'application et votre mot de passe sont corrects.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "L'obtention des jetons d'accès a échoué. Vérifiez que votre clé d'application et votre mot de passe sont corrects.",
+    "Please provide a valid app key and secret." : "Veuillez fournir une clé d'application et un mot de passe valides.",
     "Step 1 failed. Exception: %s" : "L’étape 1 a échoué. Erreur : %s",
     "Step 2 failed. Exception: %s" : "L’étape 2 a échoué. Erreur : %s",
     "External storage" : "Stockage externe",
-    "Local" : "Local",
-    "Location" : "Emplacement",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Clé",
-    "Secret" : "Secret",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 et compatibles",
-    "Access Key" : "Clé d'accès",
-    "Secret Key" : "Clé secrète",
-    "Hostname" : "Nom de l'hôte",
-    "Port" : "Port",
-    "Region" : "Région",
-    "Enable SSL" : "Activer SSL",
-    "Enable Path Style" : "Accès par path",
-    "App key" : "App key",
-    "App secret" : "App secret",
-    "Host" : "Hôte",
-    "Username" : "Nom d'utilisateur",
-    "Password" : "Mot de passe",
-    "Remote subfolder" : "Sous-dossier distant",
-    "Secure ftps://" : "Sécurisation ftps://",
-    "Client ID" : "ID Client",
-    "Client secret" : "Secret client",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Région (optionnel pour OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Clé API (requis pour Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (requis pour le stockage OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Mot de passe (requis pour OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nom du service (requis pour le stockage OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL du point d'accès d'identité (requis pour le stockage OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Délai d'attente maximal des requêtes HTTP en secondes",
-    "Share" : "Partage",
-    "SMB / CIFS using OC login" : "SMB / CIFS en utilisant les identifiants OC",
-    "Username as share" : "Nom d'utilisateur comme nom de partage",
-    "URL" : "URL",
-    "Secure https://" : "Sécurisation https://",
-    "SFTP with secret key login" : "SFTP avec identification par clé",
-    "Public key" : "Clef publique",
     "Storage with id \"%i\" not found" : "Stockage avec l'id \"%i\" non trouvé",
+    "Invalid backend or authentication mechanism class" : "Système de stockage ou méthode d'authentification non valable",
     "Invalid mount point" : "Point de montage non valide",
+    "Objectstore forbidden" : "\"Objectstore\" interdit",
     "Invalid storage backend \"%s\"" : "Service de stockage non valide : \"%s\"",
-    "Access granted" : "Accès autorisé",
-    "Error configuring Dropbox storage" : "Erreur lors de la configuration du stockage Dropbox",
-    "Grant access" : "Autoriser l'accès",
-    "Error configuring Google Drive storage" : "Erreur lors de la configuration du stockage Google Drive",
+    "Unsatisfied backend parameters" : "Paramètres manquants pour le service",
+    "Unsatisfied authentication mechanism parameters" : "Paramètres manquants pour la méthode d'authentification",
     "Personal" : "Personnel",
     "System" : "Système",
+    "Grant access" : "Autoriser l'accès",
+    "Access granted" : "Accès autorisé",
+    "Error configuring OAuth1" : "Erreur lors de la configuration de OAuth1",
+    "Error configuring OAuth2" : "Erreur lors de la configuration de OAuth2",
+    "Generate keys" : "Générer des clés",
+    "Error generating key pair" : "Erreur lors de la génération des clés",
     "Enable encryption" : "Activer le chiffrement",
     "Enable previews" : "Activer les prévisualisations",
     "Check for changes" : "Rechercher les modifications",
@@ -61,10 +29,48 @@
     "All users. Type to select user or group." : "Tous les utilisateurs. Cliquez ici pour restreindre.",
     "(group)" : "(groupe)",
     "Saved" : "Sauvegardé",
-    "Generate keys" : "Générer des clés",
-    "Error generating key pair" : "Erreur lors de la génération des clés",
+    "Access key" : "Clé d'accès",
+    "Secret key" : "Clé secrète",
+    "Builtin" : "inclus",
+    "None" : "Aucun",
+    "OAuth1" : "OAuth1",
+    "App key" : "App key",
+    "App secret" : "App secret",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "ID Client",
+    "Client secret" : "Secret client",
+    "Username" : "Nom d'utilisateur",
+    "Password" : "Mot de passe",
+    "API key" : "Clé API",
+    "Username and password" : "Nom d'utilisateur et mot de passe",
+    "Session credentials" : "Informations d'identification de session",
+    "Public key" : "Clef publique",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Nom de l'hôte",
+    "Port" : "Port",
+    "Region" : "Région",
+    "Enable SSL" : "Activer SSL",
+    "Enable Path Style" : "Accès par path",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Sous-dossier distant",
+    "Secure https://" : "Sécurisation https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Hôte",
+    "Secure ftps://" : "Sécurisation ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Local",
+    "Location" : "Emplacement",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Root",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Partage",
+    "Username as share" : "Nom d'utilisateur comme nom de partage",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Attention :</b>",
-    "and" : " et ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention :</b> La prise en charge de cURL par PHP n'est pas activée ou installée. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention : </b> La prise en charge du FTP par PHP n'est pas activée ou installée. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention : </b> \"%s\" n'est pas installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
@@ -75,11 +81,12 @@
     "Scope" : "Portée",
     "External Storage" : "Stockage externe",
     "Folder name" : "Nom du dossier",
+    "Authentication" : "Authentification",
     "Configuration" : "Configuration",
     "Available for" : "Disponible pour",
-    "Add storage" : "Ajouter un support de stockage",
     "Advanced settings" : "Paramètres avancés",
     "Delete" : "Supprimer",
+    "Add storage" : "Ajouter un support de stockage",
     "Enable User External Storage" : "Autoriser les utilisateurs à ajouter des stockages externes",
     "Allow users to mount the following external storage" : "Autoriser les utilisateurs à monter les stockages externes suivants"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
diff --git a/apps/files_external/l10n/gl.js b/apps/files_external/l10n/gl.js
index 9c46aa40b2d..fc4d4ea4931 100644
--- a/apps/files_external/l10n/gl.js
+++ b/apps/files_external/l10n/gl.js
@@ -1,59 +1,18 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Fallou a obtención de marcas de petición. Comprobe que a chave e o código secreto da súa aplicación Dropbox son correctas.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Fallou a obtención de marcas de acceso. Comprobe que a chave e o código secreto da súa aplicación Dropbox son correctas.",
-    "Please provide a valid Dropbox app key and secret." : "Forneza unha chave correcta e secreta do Dropbox.",
     "Step 1 failed. Exception: %s" : "Fallou o paso 1. Excepción: %s",
     "Step 2 failed. Exception: %s" : "Fallou o paso 2. Excepción: %s",
     "External storage" : "Almacenamento externo",
-    "Local" : "Local",
-    "Location" : "Localización",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Clave",
-    "Secret" : "Secreto",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 e compatíbeis",
-    "Access Key" : "Clave de acceso",
-    "Secret Key" : "Chave secreta",
-    "Hostname" : "Nome de máquina",
-    "Port" : "Porto",
-    "Region" : "Rexión",
-    "Enable SSL" : "Activar SSL",
-    "Enable Path Style" : "Activar o estilo de ruta",
-    "App key" : "Clave da API",
-    "App secret" : "Secreto da aplicación",
-    "Host" : "Servidor",
-    "Username" : "Nome de usuario",
-    "Password" : "Contrasinal",
-    "Remote subfolder" : "Subcartafol remoto",
-    "Secure ftps://" : "ftps:// seguro",
-    "Client ID" : "ID do cliente",
-    "Client secret" : "Secreto do cliente",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Rexión (opcional para OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Clave da API (obrigatoria para Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nome do inquilino (obrigatorio para OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Contrasinal (obrigatorio para OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nome do servizo (obrigatorio para OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL do punto final da identidade (obrigatorio para OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Caducidade, en segundos, das peticións HTTP",
-    "Share" : "Compartir",
-    "SMB / CIFS using OC login" : "SMB / CIFS usando acceso OC",
-    "Username as share" : "Nome de usuario como compartición",
-    "URL" : "URL",
-    "Secure https://" : "https:// seguro",
-    "SFTP with secret key login" : "SFTP con chave secreta de acceso",
-    "Public key" : "Chave pública",
     "Storage with id \"%i\" not found" : "Non se atopa o almacenamento co ID «%i» ",
     "Invalid mount point" : "Punto de montaxe incorrecto",
     "Invalid storage backend \"%s\"" : "Infraestrutura de almacenamento «%s» incorrecta",
-    "Access granted" : "Concedeuse acceso",
-    "Error configuring Dropbox storage" : "Produciuse un erro ao configurar o almacenamento en Dropbox",
-    "Grant access" : "Permitir o acceso",
-    "Error configuring Google Drive storage" : "Produciuse un erro ao configurar o almacenamento en Google Drive",
     "Personal" : "Persoal",
     "System" : "Sistema",
+    "Grant access" : "Permitir o acceso",
+    "Access granted" : "Concedeuse acceso",
+    "Generate keys" : "Xerar chaves",
+    "Error generating key pair" : "Produciuse un erro ao xerar o par de chaves",
     "Enable encryption" : "Activar o cifrado",
     "Enable previews" : "Activar as vistas previas",
     "Check for changes" : "Comprobar se hai cambios",
@@ -63,10 +22,37 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Todos os usuarios. Escriba para seleccionar usuario ou grupo.",
     "(group)" : "(grupo)",
     "Saved" : "Gardado",
-    "Generate keys" : "Xerar chaves",
-    "Error generating key pair" : "Produciuse un erro ao xerar o par de chaves",
+    "None" : "Ningún",
+    "App key" : "Clave da API",
+    "App secret" : "Secreto da aplicación",
+    "Client ID" : "ID do cliente",
+    "Client secret" : "Secreto do cliente",
+    "Username" : "Nome de usuario",
+    "Password" : "Contrasinal",
+    "API key" : "Chave da API",
+    "Public key" : "Chave pública",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Nome de máquina",
+    "Port" : "Porto",
+    "Region" : "Rexión",
+    "Enable SSL" : "Activar SSL",
+    "Enable Path Style" : "Activar o estilo de ruta",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Subcartafol remoto",
+    "Secure https://" : "https:// seguro",
+    "Dropbox" : "Dropbox",
+    "Host" : "Servidor",
+    "Secure ftps://" : "ftps:// seguro",
+    "Local" : "Local",
+    "Location" : "Localización",
+    "ownCloud" : "ownCloud",
+    "Root" : "Root (raíz)",
+    "Share" : "Compartir",
+    "Username as share" : "Nome de usuario como compartición",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Nota:</b> ",
-    "and" : "e",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> A compatibilidade de cURL en PHP non está activada, ou non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> A compatibilidade de FTP en PHP non está activada, ou non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> «%s»  non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo.",
@@ -79,9 +65,9 @@ OC.L10N.register(
     "Folder name" : "Nome do cartafol",
     "Configuration" : "Configuración",
     "Available for" : "Dispoñíbel para",
-    "Add storage" : "Engadir almacenamento",
     "Advanced settings" : "Axustes avanzados",
     "Delete" : "Eliminar",
+    "Add storage" : "Engadir almacenamento",
     "Enable User External Storage" : "Activar o almacenamento externo do usuario",
     "Allow users to mount the following external storage" : "Permitirlle aos usuarios montar o seguinte almacenamento externo"
 },
diff --git a/apps/files_external/l10n/gl.json b/apps/files_external/l10n/gl.json
index 18069fcd2b8..48bd2c62e9a 100644
--- a/apps/files_external/l10n/gl.json
+++ b/apps/files_external/l10n/gl.json
@@ -1,57 +1,16 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Fallou a obtención de marcas de petición. Comprobe que a chave e o código secreto da súa aplicación Dropbox son correctas.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Fallou a obtención de marcas de acceso. Comprobe que a chave e o código secreto da súa aplicación Dropbox son correctas.",
-    "Please provide a valid Dropbox app key and secret." : "Forneza unha chave correcta e secreta do Dropbox.",
     "Step 1 failed. Exception: %s" : "Fallou o paso 1. Excepción: %s",
     "Step 2 failed. Exception: %s" : "Fallou o paso 2. Excepción: %s",
     "External storage" : "Almacenamento externo",
-    "Local" : "Local",
-    "Location" : "Localización",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Clave",
-    "Secret" : "Secreto",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 e compatíbeis",
-    "Access Key" : "Clave de acceso",
-    "Secret Key" : "Chave secreta",
-    "Hostname" : "Nome de máquina",
-    "Port" : "Porto",
-    "Region" : "Rexión",
-    "Enable SSL" : "Activar SSL",
-    "Enable Path Style" : "Activar o estilo de ruta",
-    "App key" : "Clave da API",
-    "App secret" : "Secreto da aplicación",
-    "Host" : "Servidor",
-    "Username" : "Nome de usuario",
-    "Password" : "Contrasinal",
-    "Remote subfolder" : "Subcartafol remoto",
-    "Secure ftps://" : "ftps:// seguro",
-    "Client ID" : "ID do cliente",
-    "Client secret" : "Secreto do cliente",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Rexión (opcional para OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Clave da API (obrigatoria para Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nome do inquilino (obrigatorio para OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Contrasinal (obrigatorio para OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nome do servizo (obrigatorio para OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL do punto final da identidade (obrigatorio para OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Caducidade, en segundos, das peticións HTTP",
-    "Share" : "Compartir",
-    "SMB / CIFS using OC login" : "SMB / CIFS usando acceso OC",
-    "Username as share" : "Nome de usuario como compartición",
-    "URL" : "URL",
-    "Secure https://" : "https:// seguro",
-    "SFTP with secret key login" : "SFTP con chave secreta de acceso",
-    "Public key" : "Chave pública",
     "Storage with id \"%i\" not found" : "Non se atopa o almacenamento co ID «%i» ",
     "Invalid mount point" : "Punto de montaxe incorrecto",
     "Invalid storage backend \"%s\"" : "Infraestrutura de almacenamento «%s» incorrecta",
-    "Access granted" : "Concedeuse acceso",
-    "Error configuring Dropbox storage" : "Produciuse un erro ao configurar o almacenamento en Dropbox",
-    "Grant access" : "Permitir o acceso",
-    "Error configuring Google Drive storage" : "Produciuse un erro ao configurar o almacenamento en Google Drive",
     "Personal" : "Persoal",
     "System" : "Sistema",
+    "Grant access" : "Permitir o acceso",
+    "Access granted" : "Concedeuse acceso",
+    "Generate keys" : "Xerar chaves",
+    "Error generating key pair" : "Produciuse un erro ao xerar o par de chaves",
     "Enable encryption" : "Activar o cifrado",
     "Enable previews" : "Activar as vistas previas",
     "Check for changes" : "Comprobar se hai cambios",
@@ -61,10 +20,37 @@
     "All users. Type to select user or group." : "Todos os usuarios. Escriba para seleccionar usuario ou grupo.",
     "(group)" : "(grupo)",
     "Saved" : "Gardado",
-    "Generate keys" : "Xerar chaves",
-    "Error generating key pair" : "Produciuse un erro ao xerar o par de chaves",
+    "None" : "Ningún",
+    "App key" : "Clave da API",
+    "App secret" : "Secreto da aplicación",
+    "Client ID" : "ID do cliente",
+    "Client secret" : "Secreto do cliente",
+    "Username" : "Nome de usuario",
+    "Password" : "Contrasinal",
+    "API key" : "Chave da API",
+    "Public key" : "Chave pública",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Nome de máquina",
+    "Port" : "Porto",
+    "Region" : "Rexión",
+    "Enable SSL" : "Activar SSL",
+    "Enable Path Style" : "Activar o estilo de ruta",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Subcartafol remoto",
+    "Secure https://" : "https:// seguro",
+    "Dropbox" : "Dropbox",
+    "Host" : "Servidor",
+    "Secure ftps://" : "ftps:// seguro",
+    "Local" : "Local",
+    "Location" : "Localización",
+    "ownCloud" : "ownCloud",
+    "Root" : "Root (raíz)",
+    "Share" : "Compartir",
+    "Username as share" : "Nome de usuario como compartición",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Nota:</b> ",
-    "and" : "e",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> A compatibilidade de cURL en PHP non está activada, ou non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> A compatibilidade de FTP en PHP non está activada, ou non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> «%s»  non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo.",
@@ -77,9 +63,9 @@
     "Folder name" : "Nome do cartafol",
     "Configuration" : "Configuración",
     "Available for" : "Dispoñíbel para",
-    "Add storage" : "Engadir almacenamento",
     "Advanced settings" : "Axustes avanzados",
     "Delete" : "Eliminar",
+    "Add storage" : "Engadir almacenamento",
     "Enable User External Storage" : "Activar o almacenamento externo do usuario",
     "Allow users to mount the following external storage" : "Permitirlle aos usuarios montar o seguinte almacenamento externo"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/he.js b/apps/files_external/l10n/he.js
index d9e903ff3ed..2de5539e7d1 100644
--- a/apps/files_external/l10n/he.js
+++ b/apps/files_external/l10n/he.js
@@ -1,22 +1,22 @@
 OC.L10N.register(
     "files_external",
     {
-    "Please provide a valid Dropbox app key and secret." : "נא לספק קוד יישום וסוד תקניים של Dropbox.",
-    "Local" : "מקומי",
-    "Location" : "מיקום",
+    "Personal" : "אישי",
+    "Grant access" : "הענקת גישה",
+    "Access granted" : "הוענקה גישה",
+    "Saved" : "נשמר",
+    "None" : "כלום",
+    "Username" : "שם משתמש",
+    "Password" : "סיסמא",
     "Port" : "פורט",
     "Region" : "אזור",
+    "WebDAV" : "WebDAV",
+    "URL" : "כתובת",
     "Host" : "מארח",
-    "Username" : "שם משתמש",
-    "Password" : "סיסמא",
+    "Local" : "מקומי",
+    "Location" : "מיקום",
+    "ownCloud" : "ownCloud",
     "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" : "שם התיקייה",
diff --git a/apps/files_external/l10n/he.json b/apps/files_external/l10n/he.json
index fb812938345..4b4e289c53e 100644
--- a/apps/files_external/l10n/he.json
+++ b/apps/files_external/l10n/he.json
@@ -1,20 +1,20 @@
 { "translations": {
-    "Please provide a valid Dropbox app key and secret." : "נא לספק קוד יישום וסוד תקניים של Dropbox.",
-    "Local" : "מקומי",
-    "Location" : "מיקום",
+    "Personal" : "אישי",
+    "Grant access" : "הענקת גישה",
+    "Access granted" : "הוענקה גישה",
+    "Saved" : "נשמר",
+    "None" : "כלום",
+    "Username" : "שם משתמש",
+    "Password" : "סיסמא",
     "Port" : "פורט",
     "Region" : "אזור",
+    "WebDAV" : "WebDAV",
+    "URL" : "כתובת",
     "Host" : "מארח",
-    "Username" : "שם משתמש",
-    "Password" : "סיסמא",
+    "Local" : "מקומי",
+    "Location" : "מיקום",
+    "ownCloud" : "ownCloud",
     "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" : "שם התיקייה",
diff --git a/apps/files_external/l10n/hi.js b/apps/files_external/l10n/hi.js
index 97fcc0d1350..3d3b750ebd8 100644
--- a/apps/files_external/l10n/hi.js
+++ b/apps/files_external/l10n/hi.js
@@ -1,9 +1,9 @@
 OC.L10N.register(
     "files_external",
     {
+    "Personal" : "यक्तिगत",
     "Username" : "प्रयोक्ता का नाम",
     "Password" : "पासवर्ड",
-    "Share" : "साझा करें",
-    "Personal" : "यक्तिगत"
+    "Share" : "साझा करें"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/hi.json b/apps/files_external/l10n/hi.json
index cee1bf9c5cc..6e1117f610e 100644
--- a/apps/files_external/l10n/hi.json
+++ b/apps/files_external/l10n/hi.json
@@ -1,7 +1,7 @@
 { "translations": {
+    "Personal" : "यक्तिगत",
     "Username" : "प्रयोक्ता का नाम",
     "Password" : "पासवर्ड",
-    "Share" : "साझा करें",
-    "Personal" : "यक्तिगत"
+    "Share" : "साझा करें"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/hr.js b/apps/files_external/l10n/hr.js
index 37193bceeb0..7ab17521581 100644
--- a/apps/files_external/l10n/hr.js
+++ b/apps/files_external/l10n/hr.js
@@ -1,57 +1,43 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Dohvaćanje tokena zahtjeva nije uspjelo. Provjerite jesu li vaš ključ za aplikacije iz zajedničke mrežne mapei tajna aplikacije ispravni",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Dohvaćanje pristupnog tokena nije uspjelo. Provjerite jesu li vaš ključ za aplikacije iz zajedničke mrežne mapei tajna aplikacije ispravni",
-    "Please provide a valid Dropbox app key and secret." : "Molimo navedite ispravan ključ za aplikacije iz zajedničke mrežne mape i tajni kluč.",
     "Step 1 failed. Exception: %s" : "Korak 1 nije uspio. Izuzetak: %s",
     "Step 2 failed. Exception: %s" : "Korak 2 nije uspio. Izuzetak: %s",
     "External storage" : "Vanjsko spremište za pohranu",
-    "Local" : "Lokalno",
-    "Location" : "Lokacija",
+    "Personal" : "Osobno",
+    "System" : "Sustav",
+    "Grant access" : "Dodijeli pristup",
+    "Access granted" : "Pristup odobren",
+    "All users. Type to select user or group." : "Svi korisnici. Započnite unos za izbor korisnika ili grupe.",
+    "(group)" : "(grupa)",
+    "Saved" : "Spremljeno",
+    "None" : "Ništa",
+    "App key" : "Ključ za aplikacije",
+    "App secret" : "Tajna aplikacije",
+    "Client ID" : "ID klijenta",
+    "Client secret" : "Klijentski tajni ključ",
+    "Username" : "Korisničko ime",
+    "Password" : "Lozinka",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Ključ",
-    "Secret" : "Tajna",
     "Bucket" : "Kantica",
-    "Amazon S3 and compliant" : "Amazon S3 i kompatibilno",
-    "Access Key" : "Pristupni ključ",
-    "Secret Key" : "Ključ za tajnu",
     "Hostname" : "Naziv poslužitelja",
     "Port" : "Port",
     "Region" : "Regija",
     "Enable SSL" : "Omogućite SSL",
     "Enable Path Style" : "Omogućite Path Style",
-    "App key" : "Ključ za aplikacije",
-    "App secret" : "Tajna aplikacije",
-    "Host" : "Glavno računalo",
-    "Username" : "Korisničko ime",
-    "Password" : "Lozinka",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Remote subfolder" : "Udaljena podmapa",
+    "Secure https://" : "Siguran https://",
+    "Host" : "Glavno računalo",
     "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",
+    "Local" : "Lokalno",
+    "Location" : "Lokacija",
+    "ownCloud" : "OwnCloud",
+    "Root" : "Korijen",
     "Share" : "Dijeljenje zhajedničkih resursa",
-    "SMB / CIFS using OC login" : "SMB / CIFS uz prijavu putem programa OC",
     "Username as share" : "Korisničko ime kao dijeljeni resurs",
-    "URL" : "URL",
-    "Secure https://" : "Siguran https://",
-    "Access granted" : "Pristup odobren",
-    "Error configuring Dropbox storage" : "Pogreška pri konfiguriranju spremišta u zajedničkoj mrežnoj mapi",
-    "Grant access" : "Dodijeli pristup",
-    "Error configuring Google Drive storage" : "Pogreška pri konfiguriranju spremišta u Google Drive-u",
-    "Personal" : "Osobno",
-    "System" : "Sustav",
-    "All users. Type to select user or group." : "Svi korisnici. Započnite unos za izbor korisnika ili grupe.",
-    "(group)" : "(grupa)",
-    "Saved" : "Spremljeno",
+    "OpenStack Object Storage" : "Prostor za pohranu.....",
     "<b>Note:</b> " : "<b>Bilješka:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> Podrška cURL u PHP nije omogućena ili nije instalirana. Postavljanje%s nije moguće. Molimo zamolite svog administratora sustava da je instalira.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> Podrška FTP u PHP nije omogućena ili nije instalirana. Postavljanje%s nije moguće. Molimo zamolite svotg administratora sustava da je instalira.",
@@ -63,8 +49,8 @@ OC.L10N.register(
     "Folder name" : "Naziv mape",
     "Configuration" : "Konfiguracija",
     "Available for" : "Dostupno za",
-    "Add storage" : "Dodajte spremište",
     "Delete" : "Izbrišite",
+    "Add storage" : "Dodajte spremište",
     "Enable User External Storage" : "Omogućite korisničko vanjsko spremište",
     "Allow users to mount the following external storage" : "Dopustite korisnicima postavljanje sljedećeg vanjskog spremišta"
 },
diff --git a/apps/files_external/l10n/hr.json b/apps/files_external/l10n/hr.json
index 04e6c778538..23188c55fea 100644
--- a/apps/files_external/l10n/hr.json
+++ b/apps/files_external/l10n/hr.json
@@ -1,55 +1,41 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Dohvaćanje tokena zahtjeva nije uspjelo. Provjerite jesu li vaš ključ za aplikacije iz zajedničke mrežne mapei tajna aplikacije ispravni",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Dohvaćanje pristupnog tokena nije uspjelo. Provjerite jesu li vaš ključ za aplikacije iz zajedničke mrežne mapei tajna aplikacije ispravni",
-    "Please provide a valid Dropbox app key and secret." : "Molimo navedite ispravan ključ za aplikacije iz zajedničke mrežne mape i tajni kluč.",
     "Step 1 failed. Exception: %s" : "Korak 1 nije uspio. Izuzetak: %s",
     "Step 2 failed. Exception: %s" : "Korak 2 nije uspio. Izuzetak: %s",
     "External storage" : "Vanjsko spremište za pohranu",
-    "Local" : "Lokalno",
-    "Location" : "Lokacija",
+    "Personal" : "Osobno",
+    "System" : "Sustav",
+    "Grant access" : "Dodijeli pristup",
+    "Access granted" : "Pristup odobren",
+    "All users. Type to select user or group." : "Svi korisnici. Započnite unos za izbor korisnika ili grupe.",
+    "(group)" : "(grupa)",
+    "Saved" : "Spremljeno",
+    "None" : "Ništa",
+    "App key" : "Ključ za aplikacije",
+    "App secret" : "Tajna aplikacije",
+    "Client ID" : "ID klijenta",
+    "Client secret" : "Klijentski tajni ključ",
+    "Username" : "Korisničko ime",
+    "Password" : "Lozinka",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Ključ",
-    "Secret" : "Tajna",
     "Bucket" : "Kantica",
-    "Amazon S3 and compliant" : "Amazon S3 i kompatibilno",
-    "Access Key" : "Pristupni ključ",
-    "Secret Key" : "Ključ za tajnu",
     "Hostname" : "Naziv poslužitelja",
     "Port" : "Port",
     "Region" : "Regija",
     "Enable SSL" : "Omogućite SSL",
     "Enable Path Style" : "Omogućite Path Style",
-    "App key" : "Ključ za aplikacije",
-    "App secret" : "Tajna aplikacije",
-    "Host" : "Glavno računalo",
-    "Username" : "Korisničko ime",
-    "Password" : "Lozinka",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Remote subfolder" : "Udaljena podmapa",
+    "Secure https://" : "Siguran https://",
+    "Host" : "Glavno računalo",
     "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",
+    "Local" : "Lokalno",
+    "Location" : "Lokacija",
+    "ownCloud" : "OwnCloud",
+    "Root" : "Korijen",
     "Share" : "Dijeljenje zhajedničkih resursa",
-    "SMB / CIFS using OC login" : "SMB / CIFS uz prijavu putem programa OC",
     "Username as share" : "Korisničko ime kao dijeljeni resurs",
-    "URL" : "URL",
-    "Secure https://" : "Siguran https://",
-    "Access granted" : "Pristup odobren",
-    "Error configuring Dropbox storage" : "Pogreška pri konfiguriranju spremišta u zajedničkoj mrežnoj mapi",
-    "Grant access" : "Dodijeli pristup",
-    "Error configuring Google Drive storage" : "Pogreška pri konfiguriranju spremišta u Google Drive-u",
-    "Personal" : "Osobno",
-    "System" : "Sustav",
-    "All users. Type to select user or group." : "Svi korisnici. Započnite unos za izbor korisnika ili grupe.",
-    "(group)" : "(grupa)",
-    "Saved" : "Spremljeno",
+    "OpenStack Object Storage" : "Prostor za pohranu.....",
     "<b>Note:</b> " : "<b>Bilješka:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> Podrška cURL u PHP nije omogućena ili nije instalirana. Postavljanje%s nije moguće. Molimo zamolite svog administratora sustava da je instalira.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> Podrška FTP u PHP nije omogućena ili nije instalirana. Postavljanje%s nije moguće. Molimo zamolite svotg administratora sustava da je instalira.",
@@ -61,8 +47,8 @@
     "Folder name" : "Naziv mape",
     "Configuration" : "Konfiguracija",
     "Available for" : "Dostupno za",
-    "Add storage" : "Dodajte spremište",
     "Delete" : "Izbrišite",
+    "Add storage" : "Dodajte spremište",
     "Enable User External Storage" : "Omogućite korisničko vanjsko spremište",
     "Allow users to mount the following external storage" : "Dopustite korisnicima postavljanje sljedećeg vanjskog spremišta"
 },"pluralForm" :"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"
diff --git a/apps/files_external/l10n/hu_HU.js b/apps/files_external/l10n/hu_HU.js
index 7ec61b91943..563267f66fd 100644
--- a/apps/files_external/l10n/hu_HU.js
+++ b/apps/files_external/l10n/hu_HU.js
@@ -1,51 +1,46 @@
 OC.L10N.register(
     "files_external",
     {
-    "Please provide a valid Dropbox app key and secret." : "Adjon meg egy érvényes Dropbox app key-t és secretet!",
     "External storage" : "Külső tárolók",
-    "Local" : "Helyi",
-    "Location" : "Hely",
+    "Personal" : "Személyes",
+    "System" : "Rendszer",
+    "Grant access" : "Megadom a hozzáférést",
+    "Access granted" : "Érvényes hozzáférés",
+    "Enable encryption" : "Titkosítás engedélyezése",
+    "(group)" : "(csoport)",
+    "Saved" : "Elmentve",
+    "None" : "Egyik sem",
+    "App key" : "App kulcs",
+    "App secret" : "App titkos kulcs",
+    "Username" : "Felhasználónév",
+    "Password" : "Jelszó",
+    "API key" : "API kulcs",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Kulcs",
-    "Secret" : "Titkos",
     "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3-mal kompatibilisek",
-    "Access Key" : "Hozzáférési kulcs",
-    "Secret Key" : "Titkos kulcs",
     "Hostname" : "Hosztnév",
     "Port" : "Port",
     "Region" : "Megye",
     "Enable SSL" : "SSL engedélyezése",
-    "App key" : "App kulcs",
-    "App secret" : "App titkos kulcs",
-    "Host" : "Kiszolgáló",
-    "Username" : "Felhasználónév",
-    "Password" : "Jelszó",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Remote subfolder" : "Távoli alkönyvtár",
+    "Secure https://" : "Biztonságos https://",
+    "Host" : "Kiszolgáló",
     "Secure ftps://" : "Biztonságos ftps://",
-    "Timeout of HTTP requests in seconds" : "A HTTP-kérés időkorlátja másodpercben",
+    "Local" : "Helyi",
+    "Location" : "Hely",
+    "ownCloud" : "ownCloud",
     "Share" : "Megosztás",
     "Username as share" : "Felhasználónév és megosztás",
-    "URL" : "URL",
-    "Secure https://" : "Biztonságos https://",
-    "Access granted" : "Érvényes hozzáférés",
-    "Error configuring Dropbox storage" : "A Dropbox tárolót nem sikerült beállítani",
-    "Grant access" : "Megadom a hozzáférést",
-    "Error configuring Google Drive storage" : "A Google Drive tárolót nem sikerült beállítani",
-    "Personal" : "Személyes",
-    "System" : "Rendszer",
-    "(group)" : "(csoport)",
-    "Saved" : "Elmentve",
     "<b>Note:</b> " : "<b>Megjegyzés:</b>",
-    "and" : "és",
     "Name" : "Név",
     "Storage type" : "Tároló típusa",
     "External Storage" : "Külső tárolási szolgáltatások becsatolása",
     "Folder name" : "Mappanév",
     "Configuration" : "Beállítások",
     "Available for" : "Elérhető számukra",
-    "Add storage" : "Tároló becsatolása",
     "Delete" : "Törlés",
+    "Add storage" : "Tároló becsatolása",
     "Enable User External Storage" : "Külső tárolók engedélyezése a felhasználók részére"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/hu_HU.json b/apps/files_external/l10n/hu_HU.json
index f8160e2eebf..a3608dba7b7 100644
--- a/apps/files_external/l10n/hu_HU.json
+++ b/apps/files_external/l10n/hu_HU.json
@@ -1,49 +1,44 @@
 { "translations": {
-    "Please provide a valid Dropbox app key and secret." : "Adjon meg egy érvényes Dropbox app key-t és secretet!",
     "External storage" : "Külső tárolók",
-    "Local" : "Helyi",
-    "Location" : "Hely",
+    "Personal" : "Személyes",
+    "System" : "Rendszer",
+    "Grant access" : "Megadom a hozzáférést",
+    "Access granted" : "Érvényes hozzáférés",
+    "Enable encryption" : "Titkosítás engedélyezése",
+    "(group)" : "(csoport)",
+    "Saved" : "Elmentve",
+    "None" : "Egyik sem",
+    "App key" : "App kulcs",
+    "App secret" : "App titkos kulcs",
+    "Username" : "Felhasználónév",
+    "Password" : "Jelszó",
+    "API key" : "API kulcs",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Kulcs",
-    "Secret" : "Titkos",
     "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3-mal kompatibilisek",
-    "Access Key" : "Hozzáférési kulcs",
-    "Secret Key" : "Titkos kulcs",
     "Hostname" : "Hosztnév",
     "Port" : "Port",
     "Region" : "Megye",
     "Enable SSL" : "SSL engedélyezése",
-    "App key" : "App kulcs",
-    "App secret" : "App titkos kulcs",
-    "Host" : "Kiszolgáló",
-    "Username" : "Felhasználónév",
-    "Password" : "Jelszó",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Remote subfolder" : "Távoli alkönyvtár",
+    "Secure https://" : "Biztonságos https://",
+    "Host" : "Kiszolgáló",
     "Secure ftps://" : "Biztonságos ftps://",
-    "Timeout of HTTP requests in seconds" : "A HTTP-kérés időkorlátja másodpercben",
+    "Local" : "Helyi",
+    "Location" : "Hely",
+    "ownCloud" : "ownCloud",
     "Share" : "Megosztás",
     "Username as share" : "Felhasználónév és megosztás",
-    "URL" : "URL",
-    "Secure https://" : "Biztonságos https://",
-    "Access granted" : "Érvényes hozzáférés",
-    "Error configuring Dropbox storage" : "A Dropbox tárolót nem sikerült beállítani",
-    "Grant access" : "Megadom a hozzáférést",
-    "Error configuring Google Drive storage" : "A Google Drive tárolót nem sikerült beállítani",
-    "Personal" : "Személyes",
-    "System" : "Rendszer",
-    "(group)" : "(csoport)",
-    "Saved" : "Elmentve",
     "<b>Note:</b> " : "<b>Megjegyzés:</b>",
-    "and" : "és",
     "Name" : "Név",
     "Storage type" : "Tároló típusa",
     "External Storage" : "Külső tárolási szolgáltatások becsatolása",
     "Folder name" : "Mappanév",
     "Configuration" : "Beállítások",
     "Available for" : "Elérhető számukra",
-    "Add storage" : "Tároló becsatolása",
     "Delete" : "Törlés",
+    "Add storage" : "Tároló becsatolása",
     "Enable User External Storage" : "Külső tárolók engedélyezése a felhasználók részére"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/ia.js b/apps/files_external/l10n/ia.js
index f6dfe61009c..d13ee4ac10f 100644
--- a/apps/files_external/l10n/ia.js
+++ b/apps/files_external/l10n/ia.js
@@ -1,14 +1,14 @@
 OC.L10N.register(
     "files_external",
     {
-    "Location" : "Loco",
-    "Region" : "Region",
+    "Personal" : "Personal",
+    "Saved" : "Salveguardate",
     "Username" : "Nomine de usator",
     "Password" : "Contrasigno",
-    "Share" : "Compartir",
+    "Region" : "Region",
     "URL" : "URL",
-    "Personal" : "Personal",
-    "Saved" : "Salveguardate",
+    "Location" : "Loco",
+    "Share" : "Compartir",
     "Name" : "Nomine",
     "Folder name" : "Nomine de dossier",
     "Delete" : "Deler"
diff --git a/apps/files_external/l10n/ia.json b/apps/files_external/l10n/ia.json
index 64eefa5dff3..43562ce9e5b 100644
--- a/apps/files_external/l10n/ia.json
+++ b/apps/files_external/l10n/ia.json
@@ -1,12 +1,12 @@
 { "translations": {
-    "Location" : "Loco",
-    "Region" : "Region",
+    "Personal" : "Personal",
+    "Saved" : "Salveguardate",
     "Username" : "Nomine de usator",
     "Password" : "Contrasigno",
-    "Share" : "Compartir",
+    "Region" : "Region",
     "URL" : "URL",
-    "Personal" : "Personal",
-    "Saved" : "Salveguardate",
+    "Location" : "Loco",
+    "Share" : "Compartir",
     "Name" : "Nomine",
     "Folder name" : "Nomine de dossier",
     "Delete" : "Deler"
diff --git a/apps/files_external/l10n/id.js b/apps/files_external/l10n/id.js
index 7f153b9f49a..be0abf0bbae 100644
--- a/apps/files_external/l10n/id.js
+++ b/apps/files_external/l10n/id.js
@@ -1,59 +1,27 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Permintaan untuk mengambil token gagal. Pastikan kunci dan rahasia apl Dropbox Anda sudah benar.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Akses untuk mengambil token gagal. Pastikan kunci dan rahasia apl Dropbox Anda sudah benar.",
-    "Please provide a valid Dropbox app key and secret." : "Masukkan kunci dan rahasia aplikasi Dropbox yang benar.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Permintaan pengambilan token gagal. Pastikan kunci dan kerahasiaan aplikasi Anda sudah benar.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Akses pengambilan token gagal. Pastikan kunci dan kerahasiaan aplikasi Anda sudah benar.",
+    "Please provide a valid app key and secret." : "Silakan berikan kunci dan kerahasiaan aplikasi yang benar.",
     "Step 1 failed. Exception: %s" : "Langkah 1 gagal. Kecuali: %s",
     "Step 2 failed. Exception: %s" : "Langkah 2 gagal. Kecuali: %s",
     "External storage" : "Penyimpanan eksternal",
-    "Local" : "Lokal",
-    "Location" : "lokasi",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Kunci",
-    "Secret" : "Rahasia",
-    "Bucket" : "Keranjang",
-    "Amazon S3 and compliant" : "Amazon S3 dan yang sesuai",
-    "Access Key" : "Kunci Akses",
-    "Secret Key" : "Kunci Rahasia",
-    "Hostname" : "Nama Host",
-    "Port" : "Port",
-    "Region" : "Daerah",
-    "Enable SSL" : "Aktifkan SSL",
-    "Enable Path Style" : "Aktifkan Gaya Path",
-    "App key" : "Kunci Apl",
-    "App secret" : "Rahasia Apl",
-    "Host" : "Host",
-    "Username" : "Nama Pengguna",
-    "Password" : "Sandi",
-    "Remote subfolder" : "Subfolder remote",
-    "Secure ftps://" : "Secure ftps://",
-    "Client ID" : "ID Klien",
-    "Client secret" : "Rahasia klien",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Daerah (tambahan untuk OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Kunci API (diperlukan untuk Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (diperlukan untuk OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Sandi (diperlukan untuk OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nama Layanan (diperlukan untuk OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL of identity endpoint (diperlukan untuk OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Batas waktu permintaan HTTP dalam detik",
-    "Share" : "Bagikan",
-    "SMB / CIFS using OC login" : "SMB / CIFS menggunakan OC login",
-    "Username as share" : "Nama pengguna berbagi",
-    "URL" : "URL",
-    "Secure https://" : "Secure https://",
-    "SFTP with secret key login" : "SFTP dengan kunci rahasia masuk",
-    "Public key" : "Kunci Public",
     "Storage with id \"%i\" not found" : "Penyimpanan dengan id \"%i\" tidak ditemukan",
+    "Invalid backend or authentication mechanism class" : "Beckend atau kelas mekanisme otentikasi salah.",
     "Invalid mount point" : "Mount point salah",
+    "Objectstore forbidden" : "Objectstore terlarang",
     "Invalid storage backend \"%s\"" : "Backend penyimpanan \"%s\" salah",
-    "Access granted" : "Akses diberikan",
-    "Error configuring Dropbox storage" : "Kesalahan dalam mengonfigurasi penyimpanan Dropbox",
-    "Grant access" : "Berikan hak akses",
-    "Error configuring Google Drive storage" : "Kesalahan dalam mengkonfigurasi penyimpanan Google Drive",
+    "Unsatisfied backend parameters" : "Parameter backend tidak lengkap",
+    "Unsatisfied authentication mechanism parameters" : "Parameter mekanisme otentikasi tidak lengkap",
     "Personal" : "Pribadi",
     "System" : "Sistem",
+    "Grant access" : "Berikan hak akses",
+    "Access granted" : "Akses diberikan",
+    "Error configuring OAuth1" : "Kesalahan mengkonfigurasi OAuth1",
+    "Error configuring OAuth2" : "Kesalahan mengkonfigurasi OAuth2",
+    "Generate keys" : "Hasilkan kunci",
+    "Error generating key pair" : "Kesalahan saat menghasilkan pasangan kunci",
     "Enable encryption" : "Aktifkan enkripsi",
     "Enable previews" : "Aktifkan pratinjau",
     "Check for changes" : "Periksa perubahan",
@@ -63,10 +31,48 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Semua pengguna. Ketik untuk memilih pengguna atau grup.",
     "(group)" : "(grup)",
     "Saved" : "Disimpan",
-    "Generate keys" : "Hasilkan kunci",
-    "Error generating key pair" : "Kesalahan saat menghasilkan pasangan kunci",
+    "Access key" : "Kunci akses",
+    "Secret key" : "Kunci rahasia",
+    "Builtin" : "Internal",
+    "None" : "Tidak ada",
+    "OAuth1" : "OAuth1",
+    "App key" : "Kunci Apl",
+    "App secret" : "Rahasia Apl",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "ID Klien",
+    "Client secret" : "Rahasia klien",
+    "Username" : "Nama Pengguna",
+    "Password" : "Sandi",
+    "API key" : "Kunci API",
+    "Username and password" : "Nama pengguna dan sandi",
+    "Session credentials" : "Kredensial sesi",
+    "Public key" : "Kunci Public",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Keranjang",
+    "Hostname" : "Nama Host",
+    "Port" : "Port",
+    "Region" : "Daerah",
+    "Enable SSL" : "Aktifkan SSL",
+    "Enable Path Style" : "Aktifkan Gaya Path",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Subfolder remote",
+    "Secure https://" : "Secure https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Host",
+    "Secure ftps://" : "Secure ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Lokal",
+    "Location" : "lokasi",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Root",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Bagikan",
+    "Username as share" : "Nama pengguna berbagi",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Catatan:</b> ",
-    "and" : "dan",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan cURL di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan FTP di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> \"%s\" belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.",
@@ -77,11 +83,12 @@ OC.L10N.register(
     "Scope" : "Skop",
     "External Storage" : "Penyimpanan Eksternal",
     "Folder name" : "Nama folder",
+    "Authentication" : "Otentikasi",
     "Configuration" : "Konfigurasi",
     "Available for" : "Tersedia untuk",
-    "Add storage" : "Tambahkan penyimpanan",
     "Advanced settings" : "Pengaturan Lanjutan",
     "Delete" : "Hapus",
+    "Add storage" : "Tambahkan penyimpanan",
     "Enable User External Storage" : "Aktifkan Penyimpanan Eksternal Pengguna",
     "Allow users to mount the following external storage" : "Izinkan pengguna untuk mengaitkan penyimpanan eksternal berikut"
 },
diff --git a/apps/files_external/l10n/id.json b/apps/files_external/l10n/id.json
index 205ac8b210b..6c80a01b970 100644
--- a/apps/files_external/l10n/id.json
+++ b/apps/files_external/l10n/id.json
@@ -1,57 +1,25 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Permintaan untuk mengambil token gagal. Pastikan kunci dan rahasia apl Dropbox Anda sudah benar.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Akses untuk mengambil token gagal. Pastikan kunci dan rahasia apl Dropbox Anda sudah benar.",
-    "Please provide a valid Dropbox app key and secret." : "Masukkan kunci dan rahasia aplikasi Dropbox yang benar.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Permintaan pengambilan token gagal. Pastikan kunci dan kerahasiaan aplikasi Anda sudah benar.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Akses pengambilan token gagal. Pastikan kunci dan kerahasiaan aplikasi Anda sudah benar.",
+    "Please provide a valid app key and secret." : "Silakan berikan kunci dan kerahasiaan aplikasi yang benar.",
     "Step 1 failed. Exception: %s" : "Langkah 1 gagal. Kecuali: %s",
     "Step 2 failed. Exception: %s" : "Langkah 2 gagal. Kecuali: %s",
     "External storage" : "Penyimpanan eksternal",
-    "Local" : "Lokal",
-    "Location" : "lokasi",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Kunci",
-    "Secret" : "Rahasia",
-    "Bucket" : "Keranjang",
-    "Amazon S3 and compliant" : "Amazon S3 dan yang sesuai",
-    "Access Key" : "Kunci Akses",
-    "Secret Key" : "Kunci Rahasia",
-    "Hostname" : "Nama Host",
-    "Port" : "Port",
-    "Region" : "Daerah",
-    "Enable SSL" : "Aktifkan SSL",
-    "Enable Path Style" : "Aktifkan Gaya Path",
-    "App key" : "Kunci Apl",
-    "App secret" : "Rahasia Apl",
-    "Host" : "Host",
-    "Username" : "Nama Pengguna",
-    "Password" : "Sandi",
-    "Remote subfolder" : "Subfolder remote",
-    "Secure ftps://" : "Secure ftps://",
-    "Client ID" : "ID Klien",
-    "Client secret" : "Rahasia klien",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Daerah (tambahan untuk OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Kunci API (diperlukan untuk Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (diperlukan untuk OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Sandi (diperlukan untuk OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nama Layanan (diperlukan untuk OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL of identity endpoint (diperlukan untuk OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Batas waktu permintaan HTTP dalam detik",
-    "Share" : "Bagikan",
-    "SMB / CIFS using OC login" : "SMB / CIFS menggunakan OC login",
-    "Username as share" : "Nama pengguna berbagi",
-    "URL" : "URL",
-    "Secure https://" : "Secure https://",
-    "SFTP with secret key login" : "SFTP dengan kunci rahasia masuk",
-    "Public key" : "Kunci Public",
     "Storage with id \"%i\" not found" : "Penyimpanan dengan id \"%i\" tidak ditemukan",
+    "Invalid backend or authentication mechanism class" : "Beckend atau kelas mekanisme otentikasi salah.",
     "Invalid mount point" : "Mount point salah",
+    "Objectstore forbidden" : "Objectstore terlarang",
     "Invalid storage backend \"%s\"" : "Backend penyimpanan \"%s\" salah",
-    "Access granted" : "Akses diberikan",
-    "Error configuring Dropbox storage" : "Kesalahan dalam mengonfigurasi penyimpanan Dropbox",
-    "Grant access" : "Berikan hak akses",
-    "Error configuring Google Drive storage" : "Kesalahan dalam mengkonfigurasi penyimpanan Google Drive",
+    "Unsatisfied backend parameters" : "Parameter backend tidak lengkap",
+    "Unsatisfied authentication mechanism parameters" : "Parameter mekanisme otentikasi tidak lengkap",
     "Personal" : "Pribadi",
     "System" : "Sistem",
+    "Grant access" : "Berikan hak akses",
+    "Access granted" : "Akses diberikan",
+    "Error configuring OAuth1" : "Kesalahan mengkonfigurasi OAuth1",
+    "Error configuring OAuth2" : "Kesalahan mengkonfigurasi OAuth2",
+    "Generate keys" : "Hasilkan kunci",
+    "Error generating key pair" : "Kesalahan saat menghasilkan pasangan kunci",
     "Enable encryption" : "Aktifkan enkripsi",
     "Enable previews" : "Aktifkan pratinjau",
     "Check for changes" : "Periksa perubahan",
@@ -61,10 +29,48 @@
     "All users. Type to select user or group." : "Semua pengguna. Ketik untuk memilih pengguna atau grup.",
     "(group)" : "(grup)",
     "Saved" : "Disimpan",
-    "Generate keys" : "Hasilkan kunci",
-    "Error generating key pair" : "Kesalahan saat menghasilkan pasangan kunci",
+    "Access key" : "Kunci akses",
+    "Secret key" : "Kunci rahasia",
+    "Builtin" : "Internal",
+    "None" : "Tidak ada",
+    "OAuth1" : "OAuth1",
+    "App key" : "Kunci Apl",
+    "App secret" : "Rahasia Apl",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "ID Klien",
+    "Client secret" : "Rahasia klien",
+    "Username" : "Nama Pengguna",
+    "Password" : "Sandi",
+    "API key" : "Kunci API",
+    "Username and password" : "Nama pengguna dan sandi",
+    "Session credentials" : "Kredensial sesi",
+    "Public key" : "Kunci Public",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Keranjang",
+    "Hostname" : "Nama Host",
+    "Port" : "Port",
+    "Region" : "Daerah",
+    "Enable SSL" : "Aktifkan SSL",
+    "Enable Path Style" : "Aktifkan Gaya Path",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Subfolder remote",
+    "Secure https://" : "Secure https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Host",
+    "Secure ftps://" : "Secure ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Lokal",
+    "Location" : "lokasi",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Root",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Bagikan",
+    "Username as share" : "Nama pengguna berbagi",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Catatan:</b> ",
-    "and" : "dan",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan cURL di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan FTP di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> \"%s\" belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.",
@@ -75,11 +81,12 @@
     "Scope" : "Skop",
     "External Storage" : "Penyimpanan Eksternal",
     "Folder name" : "Nama folder",
+    "Authentication" : "Otentikasi",
     "Configuration" : "Konfigurasi",
     "Available for" : "Tersedia untuk",
-    "Add storage" : "Tambahkan penyimpanan",
     "Advanced settings" : "Pengaturan Lanjutan",
     "Delete" : "Hapus",
+    "Add storage" : "Tambahkan penyimpanan",
     "Enable User External Storage" : "Aktifkan Penyimpanan Eksternal Pengguna",
     "Allow users to mount the following external storage" : "Izinkan pengguna untuk mengaitkan penyimpanan eksternal berikut"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/files_external/l10n/is.js b/apps/files_external/l10n/is.js
index 644c4a06546..8af1f2ac0cf 100644
--- a/apps/files_external/l10n/is.js
+++ b/apps/files_external/l10n/is.js
@@ -1,18 +1,18 @@
 OC.L10N.register(
     "files_external",
     {
-    "Please provide a valid Dropbox app key and secret." : "Gefðu upp virkan Dropbox lykil og leynikóða",
-    "Location" : "Staðsetning",
-    "Host" : "Netþjónn",
+    "Personal" : "Um mig",
+    "Grant access" : "Veita aðgengi",
+    "Access granted" : "Aðgengi veitt",
+    "Saved" : "Vistað",
+    "None" : "Ekkert",
     "Username" : "Notendanafn",
     "Password" : "Lykilorð",
-    "Share" : "Deila",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
-    "Access granted" : "Aðgengi veitt",
-    "Error configuring Dropbox storage" : "Villa við að setja upp Dropbox gagnasvæði",
-    "Grant access" : "Veita aðgengi",
-    "Error configuring Google Drive storage" : "Villa kom upp við að setja upp Google Drive gagnasvæði",
-    "Personal" : "Um mig",
+    "Host" : "Netþjónn",
+    "Location" : "Staðsetning",
+    "Share" : "Deila",
     "Name" : "Nafn",
     "External Storage" : "Ytri gagnageymsla",
     "Folder name" : "Nafn möppu",
@@ -20,4 +20,4 @@ OC.L10N.register(
     "Delete" : "Eyða",
     "Enable User External Storage" : "Virkja ytra gagnasvæði notenda"
 },
-"nplurals=2; plural=(n % 10 == 1 || n % 100 != 11);");
+"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
diff --git a/apps/files_external/l10n/is.json b/apps/files_external/l10n/is.json
index 512f0ed76b9..8abd02bdf0a 100644
--- a/apps/files_external/l10n/is.json
+++ b/apps/files_external/l10n/is.json
@@ -1,21 +1,21 @@
 { "translations": {
-    "Please provide a valid Dropbox app key and secret." : "Gefðu upp virkan Dropbox lykil og leynikóða",
-    "Location" : "Staðsetning",
-    "Host" : "Netþjónn",
+    "Personal" : "Um mig",
+    "Grant access" : "Veita aðgengi",
+    "Access granted" : "Aðgengi veitt",
+    "Saved" : "Vistað",
+    "None" : "Ekkert",
     "Username" : "Notendanafn",
     "Password" : "Lykilorð",
-    "Share" : "Deila",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
-    "Access granted" : "Aðgengi veitt",
-    "Error configuring Dropbox storage" : "Villa við að setja upp Dropbox gagnasvæði",
-    "Grant access" : "Veita aðgengi",
-    "Error configuring Google Drive storage" : "Villa kom upp við að setja upp Google Drive gagnasvæði",
-    "Personal" : "Um mig",
+    "Host" : "Netþjónn",
+    "Location" : "Staðsetning",
+    "Share" : "Deila",
     "Name" : "Nafn",
     "External Storage" : "Ytri gagnageymsla",
     "Folder name" : "Nafn möppu",
     "Configuration" : "Uppsetning",
     "Delete" : "Eyða",
     "Enable User External Storage" : "Virkja ytra gagnasvæði notenda"
-},"pluralForm" :"nplurals=2; plural=(n % 10 == 1 || n % 100 != 11);"
+},"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/it.js b/apps/files_external/l10n/it.js
index c5d46777cf8..9c49d95fc31 100644
--- a/apps/files_external/l10n/it.js
+++ b/apps/files_external/l10n/it.js
@@ -1,59 +1,27 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Il recupero dei token di richiesta non è riuscito. Verifica che la chiave e il segreto dell'applicazione Dropbox siano corretti.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Il recupero dei token di accesso non è riuscito. Verifica che la chiave e il segreto dell'applicazione Dropbox siano corretti.",
-    "Please provide a valid Dropbox app key and secret." : "Fornisci chiave di applicazione e segreto di Dropbox validi.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Il recupero dei token di richiesta non è riuscito. Verifica che la chiave e il segreto dell'applicazione siano corretti.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Il recupero dei token di accesso non è riuscito. Verifica che la chiave e il segreto dell'applicazione siano corretti.",
+    "Please provide a valid app key and secret." : "Fornisci chiave e segreto dell'applicazione validi.",
     "Step 1 failed. Exception: %s" : "Fase 1 non riuscita. Eccezione: %s",
     "Step 2 failed. Exception: %s" : "Fase 2 non riuscita. Eccezione: %s",
     "External storage" : "Archiviazione esterna",
-    "Local" : "Locale",
-    "Location" : "Posizione",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Chiave",
-    "Secret" : "Segreto",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 e conformi",
-    "Access Key" : "Chiave di accesso",
-    "Secret Key" : "Chiave segreta",
-    "Hostname" : "Nome host",
-    "Port" : "Porta",
-    "Region" : "Regione",
-    "Enable SSL" : "Abilita SSL",
-    "Enable Path Style" : "Abilita stile percorsi",
-    "App key" : "Chiave applicazione",
-    "App secret" : "Segreto applicazione",
-    "Host" : "Host",
-    "Username" : "Nome utente",
-    "Password" : "Password",
-    "Remote subfolder" : "Sottocartella remota",
-    "Secure ftps://" : "Sicuro ftps://",
-    "Client ID" : "ID client",
-    "Client secret" : "Segreto del client",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Regione (facoltativa per OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Chiave API (richiesta per Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nome tenant (richiesto per OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Password (richiesta per OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nome servizio (richiesta per OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL del servizio di identità (richiesto per OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Tempo massimo in secondi delle richieste HTTP",
-    "Share" : "Condividi",
-    "SMB / CIFS using OC login" : "SMB / CIFS utilizzando le credenziali di OC",
-    "Username as share" : "Nome utente come condivisione",
-    "URL" : "URL",
-    "Secure https://" : "Sicuro https://",
-    "SFTP with secret key login" : "SFTP con accesso a chiave segreta",
-    "Public key" : "Chiave pubblica",
     "Storage with id \"%i\" not found" : "Archiviazione con ID \"%i\" non trovata",
+    "Invalid backend or authentication mechanism class" : "Motore o classe del meccanismo di autenticazione non valido",
     "Invalid mount point" : "Punto di mount non valido",
+    "Objectstore forbidden" : "Objectstore vietato",
     "Invalid storage backend \"%s\"" : "Motore di archiviazione \"%s\" non valido",
-    "Access granted" : "Accesso consentito",
-    "Error configuring Dropbox storage" : "Errore durante la configurazione dell'archivio Dropbox",
-    "Grant access" : "Concedi l'accesso",
-    "Error configuring Google Drive storage" : "Errore durante la configurazione dell'archivio Google Drive",
+    "Unsatisfied backend parameters" : "Parametri del motore non soddisfatti",
+    "Unsatisfied authentication mechanism parameters" : "Parametri del meccanismo di autenticazione non soddisfatti",
     "Personal" : "Personale",
     "System" : "Sistema",
+    "Grant access" : "Concedi l'accesso",
+    "Access granted" : "Accesso consentito",
+    "Error configuring OAuth1" : "Errore di configurazione OAuth1",
+    "Error configuring OAuth2" : "Errore di configurazione OAuth2",
+    "Generate keys" : "Genera la chiavi",
+    "Error generating key pair" : "Errore durante la generazione della coppia di chiavi",
     "Enable encryption" : "Abilita cifratura",
     "Enable previews" : "Abilita le anteprime",
     "Check for changes" : "Controlla le modifiche",
@@ -63,10 +31,53 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Tutti gli utenti. Digita per selezionare utente o gruppo.",
     "(group)" : "(gruppo)",
     "Saved" : "Salvato",
-    "Generate keys" : "Genera la chiavi",
-    "Error generating key pair" : "Errore durante la generazione della coppia di chiavi",
+    "Access key" : "Chiave di accesso",
+    "Secret key" : "Chiave segreta",
+    "Builtin" : "Integrata",
+    "None" : "Nessuno",
+    "OAuth1" : "OAuth1",
+    "App key" : "Chiave applicazione",
+    "App secret" : "Segreto applicazione",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "ID client",
+    "Client secret" : "Segreto del client",
+    "OpenStack" : "OpenStack",
+    "Username" : "Nome utente",
+    "Password" : "Password",
+    "Tenant name" : "Nome tenant",
+    "Rackspace" : "Rackspace",
+    "API key" : "Chiave API",
+    "Username and password" : "Nome utente e password",
+    "Session credentials" : "Credenziali di sessione",
+    "RSA public key" : "Chiave pubblica RSA",
+    "Public key" : "Chiave pubblica",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Nome host",
+    "Port" : "Porta",
+    "Region" : "Regione",
+    "Enable SSL" : "Abilita SSL",
+    "Enable Path Style" : "Abilita stile percorsi",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Sottocartella remota",
+    "Secure https://" : "Sicuro https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Host",
+    "Secure ftps://" : "Sicuro ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Locale",
+    "Location" : "Posizione",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Radice",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Condividi",
+    "Username as share" : "Nome utente come condivisione",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Service name" : "Nome servizio",
     "<b>Note:</b> " : "<b>Nota:</b>",
-    "and" : "e",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> il supporto a cURL di PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> il supporto a FTP in PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> \"%s\" non è installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.",
@@ -77,11 +88,12 @@ OC.L10N.register(
     "Scope" : "Ambito",
     "External Storage" : "Archiviazione esterna",
     "Folder name" : "Nome della cartella",
+    "Authentication" : "Autenticazione",
     "Configuration" : "Configurazione",
     "Available for" : "Disponibile per",
-    "Add storage" : "Aggiungi archiviazione",
     "Advanced settings" : "Impostazioni avanzate",
     "Delete" : "Elimina",
+    "Add storage" : "Aggiungi archiviazione",
     "Enable User External Storage" : "Abilita la memoria esterna dell'utente",
     "Allow users to mount the following external storage" : "Consenti agli utenti di montare la seguente memoria esterna"
 },
diff --git a/apps/files_external/l10n/it.json b/apps/files_external/l10n/it.json
index 6bda84a7e2d..3f6020708d2 100644
--- a/apps/files_external/l10n/it.json
+++ b/apps/files_external/l10n/it.json
@@ -1,57 +1,25 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Il recupero dei token di richiesta non è riuscito. Verifica che la chiave e il segreto dell'applicazione Dropbox siano corretti.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Il recupero dei token di accesso non è riuscito. Verifica che la chiave e il segreto dell'applicazione Dropbox siano corretti.",
-    "Please provide a valid Dropbox app key and secret." : "Fornisci chiave di applicazione e segreto di Dropbox validi.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Il recupero dei token di richiesta non è riuscito. Verifica che la chiave e il segreto dell'applicazione siano corretti.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Il recupero dei token di accesso non è riuscito. Verifica che la chiave e il segreto dell'applicazione siano corretti.",
+    "Please provide a valid app key and secret." : "Fornisci chiave e segreto dell'applicazione validi.",
     "Step 1 failed. Exception: %s" : "Fase 1 non riuscita. Eccezione: %s",
     "Step 2 failed. Exception: %s" : "Fase 2 non riuscita. Eccezione: %s",
     "External storage" : "Archiviazione esterna",
-    "Local" : "Locale",
-    "Location" : "Posizione",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Chiave",
-    "Secret" : "Segreto",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 e conformi",
-    "Access Key" : "Chiave di accesso",
-    "Secret Key" : "Chiave segreta",
-    "Hostname" : "Nome host",
-    "Port" : "Porta",
-    "Region" : "Regione",
-    "Enable SSL" : "Abilita SSL",
-    "Enable Path Style" : "Abilita stile percorsi",
-    "App key" : "Chiave applicazione",
-    "App secret" : "Segreto applicazione",
-    "Host" : "Host",
-    "Username" : "Nome utente",
-    "Password" : "Password",
-    "Remote subfolder" : "Sottocartella remota",
-    "Secure ftps://" : "Sicuro ftps://",
-    "Client ID" : "ID client",
-    "Client secret" : "Segreto del client",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Regione (facoltativa per OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Chiave API (richiesta per Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nome tenant (richiesto per OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Password (richiesta per OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nome servizio (richiesta per OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL del servizio di identità (richiesto per OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Tempo massimo in secondi delle richieste HTTP",
-    "Share" : "Condividi",
-    "SMB / CIFS using OC login" : "SMB / CIFS utilizzando le credenziali di OC",
-    "Username as share" : "Nome utente come condivisione",
-    "URL" : "URL",
-    "Secure https://" : "Sicuro https://",
-    "SFTP with secret key login" : "SFTP con accesso a chiave segreta",
-    "Public key" : "Chiave pubblica",
     "Storage with id \"%i\" not found" : "Archiviazione con ID \"%i\" non trovata",
+    "Invalid backend or authentication mechanism class" : "Motore o classe del meccanismo di autenticazione non valido",
     "Invalid mount point" : "Punto di mount non valido",
+    "Objectstore forbidden" : "Objectstore vietato",
     "Invalid storage backend \"%s\"" : "Motore di archiviazione \"%s\" non valido",
-    "Access granted" : "Accesso consentito",
-    "Error configuring Dropbox storage" : "Errore durante la configurazione dell'archivio Dropbox",
-    "Grant access" : "Concedi l'accesso",
-    "Error configuring Google Drive storage" : "Errore durante la configurazione dell'archivio Google Drive",
+    "Unsatisfied backend parameters" : "Parametri del motore non soddisfatti",
+    "Unsatisfied authentication mechanism parameters" : "Parametri del meccanismo di autenticazione non soddisfatti",
     "Personal" : "Personale",
     "System" : "Sistema",
+    "Grant access" : "Concedi l'accesso",
+    "Access granted" : "Accesso consentito",
+    "Error configuring OAuth1" : "Errore di configurazione OAuth1",
+    "Error configuring OAuth2" : "Errore di configurazione OAuth2",
+    "Generate keys" : "Genera la chiavi",
+    "Error generating key pair" : "Errore durante la generazione della coppia di chiavi",
     "Enable encryption" : "Abilita cifratura",
     "Enable previews" : "Abilita le anteprime",
     "Check for changes" : "Controlla le modifiche",
@@ -61,10 +29,53 @@
     "All users. Type to select user or group." : "Tutti gli utenti. Digita per selezionare utente o gruppo.",
     "(group)" : "(gruppo)",
     "Saved" : "Salvato",
-    "Generate keys" : "Genera la chiavi",
-    "Error generating key pair" : "Errore durante la generazione della coppia di chiavi",
+    "Access key" : "Chiave di accesso",
+    "Secret key" : "Chiave segreta",
+    "Builtin" : "Integrata",
+    "None" : "Nessuno",
+    "OAuth1" : "OAuth1",
+    "App key" : "Chiave applicazione",
+    "App secret" : "Segreto applicazione",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "ID client",
+    "Client secret" : "Segreto del client",
+    "OpenStack" : "OpenStack",
+    "Username" : "Nome utente",
+    "Password" : "Password",
+    "Tenant name" : "Nome tenant",
+    "Rackspace" : "Rackspace",
+    "API key" : "Chiave API",
+    "Username and password" : "Nome utente e password",
+    "Session credentials" : "Credenziali di sessione",
+    "RSA public key" : "Chiave pubblica RSA",
+    "Public key" : "Chiave pubblica",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Nome host",
+    "Port" : "Porta",
+    "Region" : "Regione",
+    "Enable SSL" : "Abilita SSL",
+    "Enable Path Style" : "Abilita stile percorsi",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Sottocartella remota",
+    "Secure https://" : "Sicuro https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Host",
+    "Secure ftps://" : "Sicuro ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Locale",
+    "Location" : "Posizione",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Radice",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Condividi",
+    "Username as share" : "Nome utente come condivisione",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Service name" : "Nome servizio",
     "<b>Note:</b> " : "<b>Nota:</b>",
-    "and" : "e",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> il supporto a cURL di PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> il supporto a FTP in PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> \"%s\" non è installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.",
@@ -75,11 +86,12 @@
     "Scope" : "Ambito",
     "External Storage" : "Archiviazione esterna",
     "Folder name" : "Nome della cartella",
+    "Authentication" : "Autenticazione",
     "Configuration" : "Configurazione",
     "Available for" : "Disponibile per",
-    "Add storage" : "Aggiungi archiviazione",
     "Advanced settings" : "Impostazioni avanzate",
     "Delete" : "Elimina",
+    "Add storage" : "Aggiungi archiviazione",
     "Enable User External Storage" : "Abilita la memoria esterna dell'utente",
     "Allow users to mount the following external storage" : "Consenti agli utenti di montare la seguente memoria esterna"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/ja.js b/apps/files_external/l10n/ja.js
index 9181fbb4e3a..f5a9720be2e 100644
--- a/apps/files_external/l10n/ja.js
+++ b/apps/files_external/l10n/ja.js
@@ -1,67 +1,58 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "リクエストトークンの取得に失敗しました。Dropboxアプリのキーとパスワードが正しいことを確認してください。",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "アクセストークンの取得に失敗しました。Dropboxアプリのキーとパスワードが正しいことを確認してください。",
-    "Please provide a valid Dropbox app key and secret." : "有効なDropboxアプリのキーとパスワードを入力してください。",
     "Step 1 failed. Exception: %s" : "ステップ 1 の実行に失敗しました。例外: %s",
     "Step 2 failed. Exception: %s" : "ステップ 2 の実行に失敗しました。例外: %s",
     "External storage" : "外部ストレージ",
-    "Local" : "ローカル",
-    "Location" : "位置",
+    "Storage with id \"%i\" not found" : "ストレージID \"%i\" が見つかりません",
+    "Invalid mount point" : "無効なマウントポイント",
+    "Invalid storage backend \"%s\"" : "\"%s\" のストレージバックエンドが不正",
+    "Personal" : "個人",
+    "System" : "システム",
+    "Grant access" : "アクセスを許可",
+    "Access granted" : "アクセスは許可されました",
+    "Generate keys" : "キーを生成",
+    "Error generating key pair" : "キーペアの生成エラー",
+    "Enable encryption" : "暗号化を有効に",
+    "Enable previews" : "プレビューを有効に",
+    "Check for changes" : "変更点を確認",
+    "Never" : "更新無",
+    "Once every direct access" : "直指定時のみ",
+    "Every time the filesystem is used" : "ファイルシステム利用時には毎回",
+    "All users. Type to select user or group." : "すべてのユーザー。ユーザー、グループを追加",
+    "(group)" : "(グループ)",
+    "Saved" : "保存されました",
+    "None" : "なし",
+    "App key" : "アプリキー",
+    "App secret" : "アプリシークレット",
+    "Client ID" : "クライアントID",
+    "Client secret" : "クライアント秘密キー",
+    "Username" : "ユーザー名",
+    "Password" : "パスワード",
+    "API key" : "APIキー",
+    "Public key" : "公開鍵",
     "Amazon S3" : "Amazon S3",
-    "Key" : "キー",
-    "Secret" : "シークレットキー",
     "Bucket" : "バケット名",
-    "Amazon S3 and compliant" : "Amazon S3や互換ストレージ",
-    "Access Key" : "アクセスキー",
-    "Secret Key" : "シークレットキー",
     "Hostname" : "ホスト名",
     "Port" : "ポート",
     "Region" : "リージョン",
     "Enable SSL" : "SSLを有効",
     "Enable Path Style" : "パス形式を有効",
-    "App key" : "アプリキー",
-    "App secret" : "アプリシークレット",
-    "Host" : "ホスト",
-    "Username" : "ユーザー名",
-    "Password" : "パスワード",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Remote subfolder" : "リモートサブフォルダー",
+    "Secure https://" : "セキュア https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "ホスト",
     "Secure ftps://" : "Secure ftps://",
-    "Client ID" : "クライアントID",
-    "Client secret" : "クライアント秘密キー",
-    "OpenStack Object Storage" : "OpenStack ObjectStorage",
-    "Region (optional for OpenStack Object Storage)" : "リージョン (OpenStack ObjectStorage)",
-    "API Key (required for Rackspace Cloud Files)" : "APIキー (Rackspace CloudFiles)",
-    "Tenantname (required for OpenStack Object Storage)" : "テナント名 (OpenStack ObjectStorage)",
-    "Password (required for OpenStack Object Storage)" : "パスワード (OpenStack ObjectStorage)",
-    "Service Name (required for OpenStack Object Storage)" : "サービス名 (OpenStack ObjectStorage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "識別用エンドポイントURL (OpenStack ObjectStorage)",
-    "Timeout of HTTP requests in seconds" : "HTTP接続タイムアウト秒数",
+    "Local" : "ローカル",
+    "Location" : "位置",
+    "ownCloud" : "ownCloud",
+    "Root" : "ルート",
     "Share" : "共有",
-    "SMB / CIFS using OC login" : "ownCloudログインを利用したSMB / CIFS",
     "Username as share" : "共有名",
-    "URL" : "URL",
-    "Secure https://" : "セキュア https://",
-    "Public key" : "公開鍵",
-    "Storage with id \"%i\" not found" : "ストレージID \"%i\" が見つかりません",
-    "Invalid mount point" : "無効なマウントポイント",
-    "Invalid storage backend \"%s\"" : "\"%s\" のストレージバックエンドが不正",
-    "Access granted" : "アクセスは許可されました",
-    "Error configuring Dropbox storage" : "Dropboxストレージの設定エラー",
-    "Grant access" : "アクセスを許可",
-    "Error configuring Google Drive storage" : "Googleドライブストレージの設定エラー",
-    "Personal" : "個人",
-    "System" : "システム",
-    "Enable encryption" : "暗号化を有効に",
-    "Check for changes" : "変更点を確認",
-    "All users. Type to select user or group." : "すべてのユーザー。ユーザー、グループを追加",
-    "(group)" : "(グループ)",
-    "Saved" : "保存されました",
-    "Generate keys" : "キーを生成",
-    "Error generating key pair" : "キーペアの生成エラー",
+    "OpenStack Object Storage" : "OpenStack ObjectStorage",
     "<b>Note:</b> " : "<b>注意:</b> ",
-    "and" : "と",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意:</b> PHPにcURLのエクステンションが入っていないか、有効ではありません。%s をマウントすることができません。このシステムの管理者にインストールをお願いしてください。",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意:</b> PHPにFTPのエクステンションが入っていないか、有効ではありません。%s をマウントすることができません。このシステムの管理者にインストールをお願いしてください。",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意:</b> \"%s\" がインストールされていません。%sをマウントできません。このシステムの管理者にインストールをお願いしてください。",
@@ -74,9 +65,9 @@ OC.L10N.register(
     "Folder name" : "フォルダー名",
     "Configuration" : "設定",
     "Available for" : "利用可能",
-    "Add storage" : "ストレージを追加",
     "Advanced settings" : "詳細設定",
     "Delete" : "削除",
+    "Add storage" : "ストレージを追加",
     "Enable User External Storage" : "ユーザーの外部ストレージを有効にする",
     "Allow users to mount the following external storage" : "ユーザーに以下の外部ストレージのマウントを許可する"
 },
diff --git a/apps/files_external/l10n/ja.json b/apps/files_external/l10n/ja.json
index 19a986bfb99..951e86df8ca 100644
--- a/apps/files_external/l10n/ja.json
+++ b/apps/files_external/l10n/ja.json
@@ -1,65 +1,56 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "リクエストトークンの取得に失敗しました。Dropboxアプリのキーとパスワードが正しいことを確認してください。",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "アクセストークンの取得に失敗しました。Dropboxアプリのキーとパスワードが正しいことを確認してください。",
-    "Please provide a valid Dropbox app key and secret." : "有効なDropboxアプリのキーとパスワードを入力してください。",
     "Step 1 failed. Exception: %s" : "ステップ 1 の実行に失敗しました。例外: %s",
     "Step 2 failed. Exception: %s" : "ステップ 2 の実行に失敗しました。例外: %s",
     "External storage" : "外部ストレージ",
-    "Local" : "ローカル",
-    "Location" : "位置",
+    "Storage with id \"%i\" not found" : "ストレージID \"%i\" が見つかりません",
+    "Invalid mount point" : "無効なマウントポイント",
+    "Invalid storage backend \"%s\"" : "\"%s\" のストレージバックエンドが不正",
+    "Personal" : "個人",
+    "System" : "システム",
+    "Grant access" : "アクセスを許可",
+    "Access granted" : "アクセスは許可されました",
+    "Generate keys" : "キーを生成",
+    "Error generating key pair" : "キーペアの生成エラー",
+    "Enable encryption" : "暗号化を有効に",
+    "Enable previews" : "プレビューを有効に",
+    "Check for changes" : "変更点を確認",
+    "Never" : "更新無",
+    "Once every direct access" : "直指定時のみ",
+    "Every time the filesystem is used" : "ファイルシステム利用時には毎回",
+    "All users. Type to select user or group." : "すべてのユーザー。ユーザー、グループを追加",
+    "(group)" : "(グループ)",
+    "Saved" : "保存されました",
+    "None" : "なし",
+    "App key" : "アプリキー",
+    "App secret" : "アプリシークレット",
+    "Client ID" : "クライアントID",
+    "Client secret" : "クライアント秘密キー",
+    "Username" : "ユーザー名",
+    "Password" : "パスワード",
+    "API key" : "APIキー",
+    "Public key" : "公開鍵",
     "Amazon S3" : "Amazon S3",
-    "Key" : "キー",
-    "Secret" : "シークレットキー",
     "Bucket" : "バケット名",
-    "Amazon S3 and compliant" : "Amazon S3や互換ストレージ",
-    "Access Key" : "アクセスキー",
-    "Secret Key" : "シークレットキー",
     "Hostname" : "ホスト名",
     "Port" : "ポート",
     "Region" : "リージョン",
     "Enable SSL" : "SSLを有効",
     "Enable Path Style" : "パス形式を有効",
-    "App key" : "アプリキー",
-    "App secret" : "アプリシークレット",
-    "Host" : "ホスト",
-    "Username" : "ユーザー名",
-    "Password" : "パスワード",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Remote subfolder" : "リモートサブフォルダー",
+    "Secure https://" : "セキュア https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "ホスト",
     "Secure ftps://" : "Secure ftps://",
-    "Client ID" : "クライアントID",
-    "Client secret" : "クライアント秘密キー",
-    "OpenStack Object Storage" : "OpenStack ObjectStorage",
-    "Region (optional for OpenStack Object Storage)" : "リージョン (OpenStack ObjectStorage)",
-    "API Key (required for Rackspace Cloud Files)" : "APIキー (Rackspace CloudFiles)",
-    "Tenantname (required for OpenStack Object Storage)" : "テナント名 (OpenStack ObjectStorage)",
-    "Password (required for OpenStack Object Storage)" : "パスワード (OpenStack ObjectStorage)",
-    "Service Name (required for OpenStack Object Storage)" : "サービス名 (OpenStack ObjectStorage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "識別用エンドポイントURL (OpenStack ObjectStorage)",
-    "Timeout of HTTP requests in seconds" : "HTTP接続タイムアウト秒数",
+    "Local" : "ローカル",
+    "Location" : "位置",
+    "ownCloud" : "ownCloud",
+    "Root" : "ルート",
     "Share" : "共有",
-    "SMB / CIFS using OC login" : "ownCloudログインを利用したSMB / CIFS",
     "Username as share" : "共有名",
-    "URL" : "URL",
-    "Secure https://" : "セキュア https://",
-    "Public key" : "公開鍵",
-    "Storage with id \"%i\" not found" : "ストレージID \"%i\" が見つかりません",
-    "Invalid mount point" : "無効なマウントポイント",
-    "Invalid storage backend \"%s\"" : "\"%s\" のストレージバックエンドが不正",
-    "Access granted" : "アクセスは許可されました",
-    "Error configuring Dropbox storage" : "Dropboxストレージの設定エラー",
-    "Grant access" : "アクセスを許可",
-    "Error configuring Google Drive storage" : "Googleドライブストレージの設定エラー",
-    "Personal" : "個人",
-    "System" : "システム",
-    "Enable encryption" : "暗号化を有効に",
-    "Check for changes" : "変更点を確認",
-    "All users. Type to select user or group." : "すべてのユーザー。ユーザー、グループを追加",
-    "(group)" : "(グループ)",
-    "Saved" : "保存されました",
-    "Generate keys" : "キーを生成",
-    "Error generating key pair" : "キーペアの生成エラー",
+    "OpenStack Object Storage" : "OpenStack ObjectStorage",
     "<b>Note:</b> " : "<b>注意:</b> ",
-    "and" : "と",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意:</b> PHPにcURLのエクステンションが入っていないか、有効ではありません。%s をマウントすることができません。このシステムの管理者にインストールをお願いしてください。",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意:</b> PHPにFTPのエクステンションが入っていないか、有効ではありません。%s をマウントすることができません。このシステムの管理者にインストールをお願いしてください。",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意:</b> \"%s\" がインストールされていません。%sをマウントできません。このシステムの管理者にインストールをお願いしてください。",
@@ -72,9 +63,9 @@
     "Folder name" : "フォルダー名",
     "Configuration" : "設定",
     "Available for" : "利用可能",
-    "Add storage" : "ストレージを追加",
     "Advanced settings" : "詳細設定",
     "Delete" : "削除",
+    "Add storage" : "ストレージを追加",
     "Enable User External Storage" : "ユーザーの外部ストレージを有効にする",
     "Allow users to mount the following external storage" : "ユーザーに以下の外部ストレージのマウントを許可する"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/files_external/l10n/ka_GE.js b/apps/files_external/l10n/ka_GE.js
index b152dbc7a85..6f38743a215 100644
--- a/apps/files_external/l10n/ka_GE.js
+++ b/apps/files_external/l10n/ka_GE.js
@@ -1,27 +1,28 @@
 OC.L10N.register(
     "files_external",
     {
-    "Please provide a valid Dropbox app key and secret." : "გთხოვთ მიუთითოთ Dropbox აპლიკაციის გასაღები და კოდი.",
     "External storage" : "ექსტერნალ საცავი",
-    "Location" : "ადგილმდებარეობა",
+    "Personal" : "პირადი",
+    "Grant access" : "დაშვების მინიჭება",
+    "Access granted" : "დაშვება მინიჭებულია",
+    "None" : "არა",
+    "Username" : "მომხმარებლის სახელი",
+    "Password" : "პაროლი",
+    "API key" : "API გასაღები",
     "Port" : "პორტი",
     "Region" : "რეგიონი",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Host" : "ჰოსტი",
-    "Username" : "მომხმარებლის სახელი",
-    "Password" : "პაროლი",
+    "Location" : "ადგილმდებარეობა",
+    "ownCloud" : "ownCloud–ი",
     "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" : "წაშლა",
+    "Add storage" : "საცავის დამატება",
     "Enable User External Storage" : "მომხმარებლის ექსტერნალ საცავის აქტივირება"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files_external/l10n/ka_GE.json b/apps/files_external/l10n/ka_GE.json
index 9e5e8e8db80..7ca96f6db5d 100644
--- a/apps/files_external/l10n/ka_GE.json
+++ b/apps/files_external/l10n/ka_GE.json
@@ -1,25 +1,26 @@
 { "translations": {
-    "Please provide a valid Dropbox app key and secret." : "გთხოვთ მიუთითოთ Dropbox აპლიკაციის გასაღები და კოდი.",
     "External storage" : "ექსტერნალ საცავი",
-    "Location" : "ადგილმდებარეობა",
+    "Personal" : "პირადი",
+    "Grant access" : "დაშვების მინიჭება",
+    "Access granted" : "დაშვება მინიჭებულია",
+    "None" : "არა",
+    "Username" : "მომხმარებლის სახელი",
+    "Password" : "პაროლი",
+    "API key" : "API გასაღები",
     "Port" : "პორტი",
     "Region" : "რეგიონი",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Host" : "ჰოსტი",
-    "Username" : "მომხმარებლის სახელი",
-    "Password" : "პაროლი",
+    "Location" : "ადგილმდებარეობა",
+    "ownCloud" : "ownCloud–ი",
     "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" : "წაშლა",
+    "Add storage" : "საცავის დამატება",
     "Enable User External Storage" : "მომხმარებლის ექსტერნალ საცავის აქტივირება"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/km.js b/apps/files_external/l10n/km.js
index 0706c6d8b28..7a5c6cb86c8 100644
--- a/apps/files_external/l10n/km.js
+++ b/apps/files_external/l10n/km.js
@@ -2,23 +2,24 @@ OC.L10N.register(
     "files_external",
     {
     "External storage" : "ឃ្លាំងផ្ទុក​ខាងក្រៅ",
-    "Location" : "ទីតាំង",
-    "Port" : "ច្រក",
-    "Host" : "ម៉ាស៊ីន​ផ្ទុក",
+    "Personal" : "ផ្ទាល់​ខ្លួន",
+    "Grant access" : "ទទួល​សិទ្ធិ​ចូល",
+    "Access granted" : "បាន​ទទួល​សិទ្ធិ​ចូល",
+    "Saved" : "បាន​រក្សាទុក",
+    "None" : "គ្មាន",
     "Username" : "ឈ្មោះ​អ្នកប្រើ",
     "Password" : "ពាក្យសម្ងាត់",
-    "Share" : "ចែក​រំលែក",
+    "Port" : "ច្រក",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
-    "Access granted" : "បាន​ទទួល​សិទ្ធិ​ចូល",
-    "Error configuring Dropbox storage" : "កំហុស​ការ​កំណត់​សណ្ឋាន​នៃ​ឃ្លាំងផ្ទុក Dropbox",
-    "Grant access" : "ទទួល​សិទ្ធិ​ចូល",
-    "Personal" : "ផ្ទាល់​ខ្លួន",
-    "Saved" : "បាន​រក្សាទុក",
+    "Host" : "ម៉ាស៊ីន​ផ្ទុក",
+    "Location" : "ទីតាំង",
+    "Share" : "ចែក​រំលែក",
     "Name" : "ឈ្មោះ",
     "External Storage" : "ឃ្លាំងផ្ទុក​ខាងក្រៅ",
     "Folder name" : "ឈ្មោះ​ថត",
     "Configuration" : "ការ​កំណត់​សណ្ឋាន",
-    "Add storage" : "បន្ថែម​ឃ្លាំងផ្ទុក",
-    "Delete" : "លុប"
+    "Delete" : "លុប",
+    "Add storage" : "បន្ថែម​ឃ្លាំងផ្ទុក"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files_external/l10n/km.json b/apps/files_external/l10n/km.json
index 3696e721b8a..0375b5bfee2 100644
--- a/apps/files_external/l10n/km.json
+++ b/apps/files_external/l10n/km.json
@@ -1,22 +1,23 @@
 { "translations": {
     "External storage" : "ឃ្លាំងផ្ទុក​ខាងក្រៅ",
-    "Location" : "ទីតាំង",
-    "Port" : "ច្រក",
-    "Host" : "ម៉ាស៊ីន​ផ្ទុក",
+    "Personal" : "ផ្ទាល់​ខ្លួន",
+    "Grant access" : "ទទួល​សិទ្ធិ​ចូល",
+    "Access granted" : "បាន​ទទួល​សិទ្ធិ​ចូល",
+    "Saved" : "បាន​រក្សាទុក",
+    "None" : "គ្មាន",
     "Username" : "ឈ្មោះ​អ្នកប្រើ",
     "Password" : "ពាក្យសម្ងាត់",
-    "Share" : "ចែក​រំលែក",
+    "Port" : "ច្រក",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
-    "Access granted" : "បាន​ទទួល​សិទ្ធិ​ចូល",
-    "Error configuring Dropbox storage" : "កំហុស​ការ​កំណត់​សណ្ឋាន​នៃ​ឃ្លាំងផ្ទុក Dropbox",
-    "Grant access" : "ទទួល​សិទ្ធិ​ចូល",
-    "Personal" : "ផ្ទាល់​ខ្លួន",
-    "Saved" : "បាន​រក្សាទុក",
+    "Host" : "ម៉ាស៊ីន​ផ្ទុក",
+    "Location" : "ទីតាំង",
+    "Share" : "ចែក​រំលែក",
     "Name" : "ឈ្មោះ",
     "External Storage" : "ឃ្លាំងផ្ទុក​ខាងក្រៅ",
     "Folder name" : "ឈ្មោះ​ថត",
     "Configuration" : "ការ​កំណត់​សណ្ឋាន",
-    "Add storage" : "បន្ថែម​ឃ្លាំងផ្ទុក",
-    "Delete" : "លុប"
+    "Delete" : "លុប",
+    "Add storage" : "បន្ថែម​ឃ្លាំងផ្ទុក"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/kn.js b/apps/files_external/l10n/kn.js
index ad1987e2266..9d01033e356 100644
--- a/apps/files_external/l10n/kn.js
+++ b/apps/files_external/l10n/kn.js
@@ -1,15 +1,17 @@
 OC.L10N.register(
     "files_external",
     {
-    "Local" : "ಸ್ಥಳೀಯ",
-    "Port" : "ರೇವು",
-    "Host" : "ಅತಿಥೆಯ-ಗಣಕ",
+    "Personal" : "ವೈಯಕ್ತಿಕ",
+    "Saved" : "ಉಳಿಸಿದ",
+    "None" : "ಯಾವುದೂ ಇಲ್ಲ",
     "Username" : "ಬಳಕೆಯ ಹೆಸರು",
     "Password" : "ಗುಪ್ತ ಪದ",
-    "Share" : "ಹಂಚಿಕೊಳ್ಳಿ",
+    "Port" : "ರೇವು",
+    "WebDAV" : "WebDAV",
     "URL" : "ಜಾಲದ ಕೊಂಡಿ",
-    "Personal" : "ವೈಯಕ್ತಿಕ",
-    "Saved" : "ಉಳಿಸಿದ",
+    "Host" : "ಅತಿಥೆಯ-ಗಣಕ",
+    "Local" : "ಸ್ಥಳೀಯ",
+    "Share" : "ಹಂಚಿಕೊಳ್ಳಿ",
     "Name" : "ಹೆಸರು",
     "Delete" : "ಅಳಿಸಿ"
 },
diff --git a/apps/files_external/l10n/kn.json b/apps/files_external/l10n/kn.json
index 74fc7e223bd..0380f431d1e 100644
--- a/apps/files_external/l10n/kn.json
+++ b/apps/files_external/l10n/kn.json
@@ -1,13 +1,15 @@
 { "translations": {
-    "Local" : "ಸ್ಥಳೀಯ",
-    "Port" : "ರೇವು",
-    "Host" : "ಅತಿಥೆಯ-ಗಣಕ",
+    "Personal" : "ವೈಯಕ್ತಿಕ",
+    "Saved" : "ಉಳಿಸಿದ",
+    "None" : "ಯಾವುದೂ ಇಲ್ಲ",
     "Username" : "ಬಳಕೆಯ ಹೆಸರು",
     "Password" : "ಗುಪ್ತ ಪದ",
-    "Share" : "ಹಂಚಿಕೊಳ್ಳಿ",
+    "Port" : "ರೇವು",
+    "WebDAV" : "WebDAV",
     "URL" : "ಜಾಲದ ಕೊಂಡಿ",
-    "Personal" : "ವೈಯಕ್ತಿಕ",
-    "Saved" : "ಉಳಿಸಿದ",
+    "Host" : "ಅತಿಥೆಯ-ಗಣಕ",
+    "Local" : "ಸ್ಥಳೀಯ",
+    "Share" : "ಹಂಚಿಕೊಳ್ಳಿ",
     "Name" : "ಹೆಸರು",
     "Delete" : "ಅಳಿಸಿ"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/files_external/l10n/ko.js b/apps/files_external/l10n/ko.js
index de1ca02820e..3bed24abe66 100644
--- a/apps/files_external/l10n/ko.js
+++ b/apps/files_external/l10n/ko.js
@@ -1,59 +1,27 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "요청 토큰을 가져올 수 없습니다. Dropbox 앱 키와 비밀 값이 올바른지 확인하십시오.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "접근 토큰을 가져올 수 없습니다. Dropbox 앱 키와 비밀 값이 올바른지 확인하십시오.",
-    "Please provide a valid Dropbox app key and secret." : "올바른 Dropbox 앱 키와 암호를 입력하십시오.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "요청 토큰을 가져올 수 없습니다. 앱 키와 비밀 값이 올바른지 확인하십시오.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "접근 토큰을 가져올 수 없습니다. 앱 키와 비밀 값이 올바른지 확인하십시오.",
+    "Please provide a valid app key and secret." : "올바른 앱 키와 비밀 값을 입력하십시오.",
     "Step 1 failed. Exception: %s" : "1단계 실패. 예외: %s",
     "Step 2 failed. Exception: %s" : "2단계 실패. 예외: %s",
     "External storage" : "외부 저장소",
-    "Local" : "로컬",
-    "Location" : "위치",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "키",
-    "Secret" : "비밀 값",
-    "Bucket" : "버킷",
-    "Amazon S3 and compliant" : "Amazon S3 및 호환 가능 서비스",
-    "Access Key" : "접근 키",
-    "Secret Key" : "비밀 키",
-    "Hostname" : "호스트 이름",
-    "Port" : "포트",
-    "Region" : "지역",
-    "Enable SSL" : "SSL 사용",
-    "Enable Path Style" : "경로 스타일 사용",
-    "App key" : "앱 키",
-    "App secret" : "앱 비밀 값",
-    "Host" : "호스트",
-    "Username" : "사용자 이름",
-    "Password" : "암호",
-    "Remote subfolder" : "원격 하위 폴더",
-    "Secure ftps://" : "보안 ftps://",
-    "Client ID" : "클라이언트 ID",
-    "Client secret" : "클라이언트 비밀 값",
-    "OpenStack Object Storage" : "OpenStack 객체 저장소",
-    "Region (optional for OpenStack Object Storage)" : "지역(OpenStack 객체 저장소는 선택 사항)",
-    "API Key (required for Rackspace Cloud Files)" : "API 키(Rackspace 클라우드 파일에 필요함)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname(OpenStack 객체 저장소에 필요함)",
-    "Password (required for OpenStack Object Storage)" : "암호(OpenStack 객체 저장소에 필요함)",
-    "Service Name (required for OpenStack Object Storage)" : "서비스 이름(OpenStack 객체 저장소에 필요함)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Identity 엔드포인트 URL(OpenStack 객체 저장소에 필요함)",
-    "Timeout of HTTP requests in seconds" : "초 단위 HTTP 요청 시간 제한",
-    "Share" : "공유",
-    "SMB / CIFS using OC login" : "OC 로그인을 사용하는 SMB/CIFS",
-    "Username as share" : "사용자 이름으로 공유",
-    "URL" : "URL",
-    "Secure https://" : "보안 https://",
-    "SFTP with secret key login" : "비밀 키 로그인을 사용하는 SFTP",
-    "Public key" : "공개 키",
     "Storage with id \"%i\" not found" : "ID가 \"%i\"인 저장소를 찾을 수 없음",
+    "Invalid backend or authentication mechanism class" : "백엔드나 인증 방식 클래스가 잘못됨",
     "Invalid mount point" : "잘못된 마운트 지점",
+    "Objectstore forbidden" : "Objectstore에 접근 금지됨",
     "Invalid storage backend \"%s\"" : "잘못된 저장소 백엔드 \"%s\"",
-    "Access granted" : "접근 허가됨",
-    "Error configuring Dropbox storage" : "Dropbox 저장소 설정 오류",
-    "Grant access" : "접근 권한 부여",
-    "Error configuring Google Drive storage" : "Google 드라이브 저장소 설정 오류",
+    "Unsatisfied backend parameters" : "백엔드 인자가 부족함",
+    "Unsatisfied authentication mechanism parameters" : "인증 방식 인자가 부족함",
     "Personal" : "개인",
     "System" : "시스템",
+    "Grant access" : "접근 권한 부여",
+    "Access granted" : "접근 허가됨",
+    "Error configuring OAuth1" : "OAuth1 설정 오류",
+    "Error configuring OAuth2" : "OAuth2 설정 오류",
+    "Generate keys" : "키 생성",
+    "Error generating key pair" : "키 쌍을 생성하는 중 오류 발생",
     "Enable encryption" : "암호화 사용",
     "Enable previews" : "미리 보기 사용",
     "Check for changes" : "변경 사항 감시",
@@ -63,10 +31,48 @@ OC.L10N.register(
     "All users. Type to select user or group." : "모든 사용자입니다. 사용자나 그룹을 선택하려면 입력하십시오",
     "(group)" : "(그룹)",
     "Saved" : "저장됨",
-    "Generate keys" : "키 생성",
-    "Error generating key pair" : "키 쌍을 생성하는 중 오류 발생",
+    "Access key" : "접근 키",
+    "Secret key" : "비밀 키",
+    "Builtin" : "내장",
+    "None" : "없음",
+    "OAuth1" : "OAuth1",
+    "App key" : "앱 키",
+    "App secret" : "앱 비밀 값",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "클라이언트 ID",
+    "Client secret" : "클라이언트 비밀 값",
+    "Username" : "사용자 이름",
+    "Password" : "암호",
+    "API key" : "API 키",
+    "Username and password" : "사용자 이름과 암호",
+    "Session credentials" : "세션 접근 정보",
+    "Public key" : "공개 키",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "버킷",
+    "Hostname" : "호스트 이름",
+    "Port" : "포트",
+    "Region" : "지역",
+    "Enable SSL" : "SSL 사용",
+    "Enable Path Style" : "경로 스타일 사용",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "원격 하위 폴더",
+    "Secure https://" : "보안 https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "호스트",
+    "Secure ftps://" : "보안 ftps://",
+    "Google Drive" : "Google 드라이브",
+    "Local" : "로컬",
+    "Location" : "위치",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "루트",
+    "SMB / CIFS" : "SMB/CIFS",
+    "Share" : "공유",
+    "Username as share" : "사용자 이름으로 공유",
+    "OpenStack Object Storage" : "OpenStack 객체 저장소",
     "<b>Note:</b> " : "<b>메모:</b>",
-    "and" : "그리고",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>메모:</b> PHP cURL 모듈이 비활성화되어 있거나 설치되어 있지 않습니다. %s을(를) 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>메모:</b> PHP FTP 모듈이 비활성화되어 있거나 설치되어 있지 않습니다. %s을(를) 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>메모:</b> \"%s\"이(가) 설치되어 있지 않습니다. %s을(를) 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
@@ -77,11 +83,12 @@ OC.L10N.register(
     "Scope" : "범위",
     "External Storage" : "외부 저장소",
     "Folder name" : "폴더 이름",
+    "Authentication" : "인증",
     "Configuration" : "설정",
     "Available for" : "다음으로 사용 가능",
-    "Add storage" : "저장소 추가",
     "Advanced settings" : "고급 설정",
     "Delete" : "삭제",
+    "Add storage" : "저장소 추가",
     "Enable User External Storage" : "사용자 외부 저장소 사용",
     "Allow users to mount the following external storage" : "사용자가 다음 외부 저장소를 마운트할 수 있도록 허용"
 },
diff --git a/apps/files_external/l10n/ko.json b/apps/files_external/l10n/ko.json
index 843a9dac051..86cecf01329 100644
--- a/apps/files_external/l10n/ko.json
+++ b/apps/files_external/l10n/ko.json
@@ -1,57 +1,25 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "요청 토큰을 가져올 수 없습니다. Dropbox 앱 키와 비밀 값이 올바른지 확인하십시오.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "접근 토큰을 가져올 수 없습니다. Dropbox 앱 키와 비밀 값이 올바른지 확인하십시오.",
-    "Please provide a valid Dropbox app key and secret." : "올바른 Dropbox 앱 키와 암호를 입력하십시오.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "요청 토큰을 가져올 수 없습니다. 앱 키와 비밀 값이 올바른지 확인하십시오.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "접근 토큰을 가져올 수 없습니다. 앱 키와 비밀 값이 올바른지 확인하십시오.",
+    "Please provide a valid app key and secret." : "올바른 앱 키와 비밀 값을 입력하십시오.",
     "Step 1 failed. Exception: %s" : "1단계 실패. 예외: %s",
     "Step 2 failed. Exception: %s" : "2단계 실패. 예외: %s",
     "External storage" : "외부 저장소",
-    "Local" : "로컬",
-    "Location" : "위치",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "키",
-    "Secret" : "비밀 값",
-    "Bucket" : "버킷",
-    "Amazon S3 and compliant" : "Amazon S3 및 호환 가능 서비스",
-    "Access Key" : "접근 키",
-    "Secret Key" : "비밀 키",
-    "Hostname" : "호스트 이름",
-    "Port" : "포트",
-    "Region" : "지역",
-    "Enable SSL" : "SSL 사용",
-    "Enable Path Style" : "경로 스타일 사용",
-    "App key" : "앱 키",
-    "App secret" : "앱 비밀 값",
-    "Host" : "호스트",
-    "Username" : "사용자 이름",
-    "Password" : "암호",
-    "Remote subfolder" : "원격 하위 폴더",
-    "Secure ftps://" : "보안 ftps://",
-    "Client ID" : "클라이언트 ID",
-    "Client secret" : "클라이언트 비밀 값",
-    "OpenStack Object Storage" : "OpenStack 객체 저장소",
-    "Region (optional for OpenStack Object Storage)" : "지역(OpenStack 객체 저장소는 선택 사항)",
-    "API Key (required for Rackspace Cloud Files)" : "API 키(Rackspace 클라우드 파일에 필요함)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname(OpenStack 객체 저장소에 필요함)",
-    "Password (required for OpenStack Object Storage)" : "암호(OpenStack 객체 저장소에 필요함)",
-    "Service Name (required for OpenStack Object Storage)" : "서비스 이름(OpenStack 객체 저장소에 필요함)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Identity 엔드포인트 URL(OpenStack 객체 저장소에 필요함)",
-    "Timeout of HTTP requests in seconds" : "초 단위 HTTP 요청 시간 제한",
-    "Share" : "공유",
-    "SMB / CIFS using OC login" : "OC 로그인을 사용하는 SMB/CIFS",
-    "Username as share" : "사용자 이름으로 공유",
-    "URL" : "URL",
-    "Secure https://" : "보안 https://",
-    "SFTP with secret key login" : "비밀 키 로그인을 사용하는 SFTP",
-    "Public key" : "공개 키",
     "Storage with id \"%i\" not found" : "ID가 \"%i\"인 저장소를 찾을 수 없음",
+    "Invalid backend or authentication mechanism class" : "백엔드나 인증 방식 클래스가 잘못됨",
     "Invalid mount point" : "잘못된 마운트 지점",
+    "Objectstore forbidden" : "Objectstore에 접근 금지됨",
     "Invalid storage backend \"%s\"" : "잘못된 저장소 백엔드 \"%s\"",
-    "Access granted" : "접근 허가됨",
-    "Error configuring Dropbox storage" : "Dropbox 저장소 설정 오류",
-    "Grant access" : "접근 권한 부여",
-    "Error configuring Google Drive storage" : "Google 드라이브 저장소 설정 오류",
+    "Unsatisfied backend parameters" : "백엔드 인자가 부족함",
+    "Unsatisfied authentication mechanism parameters" : "인증 방식 인자가 부족함",
     "Personal" : "개인",
     "System" : "시스템",
+    "Grant access" : "접근 권한 부여",
+    "Access granted" : "접근 허가됨",
+    "Error configuring OAuth1" : "OAuth1 설정 오류",
+    "Error configuring OAuth2" : "OAuth2 설정 오류",
+    "Generate keys" : "키 생성",
+    "Error generating key pair" : "키 쌍을 생성하는 중 오류 발생",
     "Enable encryption" : "암호화 사용",
     "Enable previews" : "미리 보기 사용",
     "Check for changes" : "변경 사항 감시",
@@ -61,10 +29,48 @@
     "All users. Type to select user or group." : "모든 사용자입니다. 사용자나 그룹을 선택하려면 입력하십시오",
     "(group)" : "(그룹)",
     "Saved" : "저장됨",
-    "Generate keys" : "키 생성",
-    "Error generating key pair" : "키 쌍을 생성하는 중 오류 발생",
+    "Access key" : "접근 키",
+    "Secret key" : "비밀 키",
+    "Builtin" : "내장",
+    "None" : "없음",
+    "OAuth1" : "OAuth1",
+    "App key" : "앱 키",
+    "App secret" : "앱 비밀 값",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "클라이언트 ID",
+    "Client secret" : "클라이언트 비밀 값",
+    "Username" : "사용자 이름",
+    "Password" : "암호",
+    "API key" : "API 키",
+    "Username and password" : "사용자 이름과 암호",
+    "Session credentials" : "세션 접근 정보",
+    "Public key" : "공개 키",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "버킷",
+    "Hostname" : "호스트 이름",
+    "Port" : "포트",
+    "Region" : "지역",
+    "Enable SSL" : "SSL 사용",
+    "Enable Path Style" : "경로 스타일 사용",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "원격 하위 폴더",
+    "Secure https://" : "보안 https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "호스트",
+    "Secure ftps://" : "보안 ftps://",
+    "Google Drive" : "Google 드라이브",
+    "Local" : "로컬",
+    "Location" : "위치",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "루트",
+    "SMB / CIFS" : "SMB/CIFS",
+    "Share" : "공유",
+    "Username as share" : "사용자 이름으로 공유",
+    "OpenStack Object Storage" : "OpenStack 객체 저장소",
     "<b>Note:</b> " : "<b>메모:</b>",
-    "and" : "그리고",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>메모:</b> PHP cURL 모듈이 비활성화되어 있거나 설치되어 있지 않습니다. %s을(를) 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>메모:</b> PHP FTP 모듈이 비활성화되어 있거나 설치되어 있지 않습니다. %s을(를) 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>메모:</b> \"%s\"이(가) 설치되어 있지 않습니다. %s을(를) 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
@@ -75,11 +81,12 @@
     "Scope" : "범위",
     "External Storage" : "외부 저장소",
     "Folder name" : "폴더 이름",
+    "Authentication" : "인증",
     "Configuration" : "설정",
     "Available for" : "다음으로 사용 가능",
-    "Add storage" : "저장소 추가",
     "Advanced settings" : "고급 설정",
     "Delete" : "삭제",
+    "Add storage" : "저장소 추가",
     "Enable User External Storage" : "사용자 외부 저장소 사용",
     "Allow users to mount the following external storage" : "사용자가 다음 외부 저장소를 마운트할 수 있도록 허용"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/files_external/l10n/ku_IQ.js b/apps/files_external/l10n/ku_IQ.js
index 60110b5a0a7..72c1e8313be 100644
--- a/apps/files_external/l10n/ku_IQ.js
+++ b/apps/files_external/l10n/ku_IQ.js
@@ -1,11 +1,12 @@
 OC.L10N.register(
     "files_external",
     {
-    "Location" : "شوێن",
+    "None" : "هیچ",
     "Username" : "ناوی به‌کارهێنه‌ر",
     "Password" : "وشەی تێپەربو",
-    "Share" : "هاوبەشی کردن",
     "URL" : "ناونیشانی به‌سته‌ر",
+    "Location" : "شوێن",
+    "Share" : "هاوبەشی کردن",
     "Name" : "ناو",
     "Folder name" : "ناوی بوخچه"
 },
diff --git a/apps/files_external/l10n/ku_IQ.json b/apps/files_external/l10n/ku_IQ.json
index 5116096025f..9ef5a71e818 100644
--- a/apps/files_external/l10n/ku_IQ.json
+++ b/apps/files_external/l10n/ku_IQ.json
@@ -1,9 +1,10 @@
 { "translations": {
-    "Location" : "شوێن",
+    "None" : "هیچ",
     "Username" : "ناوی به‌کارهێنه‌ر",
     "Password" : "وشەی تێپەربو",
-    "Share" : "هاوبەشی کردن",
     "URL" : "ناونیشانی به‌سته‌ر",
+    "Location" : "شوێن",
+    "Share" : "هاوبەشی کردن",
     "Name" : "ناو",
     "Folder name" : "ناوی بوخچه"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/lb.js b/apps/files_external/l10n/lb.js
index 4f18f5b6e39..7e03d3b1b99 100644
--- a/apps/files_external/l10n/lb.js
+++ b/apps/files_external/l10n/lb.js
@@ -1,16 +1,17 @@
 OC.L10N.register(
     "files_external",
     {
-    "Location" : "Uert",
+    "Personal" : "Perséinlech",
+    "Saved" : "Gespäichert",
+    "Username" : "Benotzernumm",
+    "Password" : "Passwuert",
     "Port" : "Port",
     "Region" : "Regioun",
+    "URL" : "URL",
     "Host" : "Host",
-    "Username" : "Benotzernumm",
-    "Password" : "Passwuert",
+    "Location" : "Uert",
+    "ownCloud" : "ownCloud",
     "Share" : "Deelen",
-    "URL" : "URL",
-    "Personal" : "Perséinlech",
-    "Saved" : "Gespäichert",
     "Name" : "Numm",
     "Folder name" : "Dossiers Numm:",
     "Delete" : "Läschen"
diff --git a/apps/files_external/l10n/lb.json b/apps/files_external/l10n/lb.json
index a9acd181800..5c6797533b5 100644
--- a/apps/files_external/l10n/lb.json
+++ b/apps/files_external/l10n/lb.json
@@ -1,14 +1,15 @@
 { "translations": {
-    "Location" : "Uert",
+    "Personal" : "Perséinlech",
+    "Saved" : "Gespäichert",
+    "Username" : "Benotzernumm",
+    "Password" : "Passwuert",
     "Port" : "Port",
     "Region" : "Regioun",
+    "URL" : "URL",
     "Host" : "Host",
-    "Username" : "Benotzernumm",
-    "Password" : "Passwuert",
+    "Location" : "Uert",
+    "ownCloud" : "ownCloud",
     "Share" : "Deelen",
-    "URL" : "URL",
-    "Personal" : "Perséinlech",
-    "Saved" : "Gespäichert",
     "Name" : "Numm",
     "Folder name" : "Dossiers Numm:",
     "Delete" : "Läschen"
diff --git a/apps/files_external/l10n/lt_LT.js b/apps/files_external/l10n/lt_LT.js
index fa8dcec68e0..9232ec997d2 100644
--- a/apps/files_external/l10n/lt_LT.js
+++ b/apps/files_external/l10n/lt_LT.js
@@ -1,27 +1,28 @@
 OC.L10N.register(
     "files_external",
     {
-    "Please provide a valid Dropbox app key and secret." : "Prašome įvesti teisingus Dropbox \"app key\" ir \"secret\".",
     "External storage" : "Išorinė saugykla",
-    "Location" : "Vieta",
+    "Personal" : "Asmeniniai",
+    "Grant access" : "Suteikti priėjimą",
+    "Access granted" : "Priėjimas suteiktas",
+    "None" : "Nieko",
+    "Username" : "Prisijungimo vardas",
+    "Password" : "Slaptažodis",
+    "API key" : "API raktas",
     "Port" : "Prievadas",
     "Region" : "Regionas",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Host" : "Mazgas",
-    "Username" : "Prisijungimo vardas",
-    "Password" : "Slaptažodis",
+    "Location" : "Vieta",
+    "ownCloud" : "ownCloud",
     "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",
+    "Add storage" : "Pridėti saugyklą",
     "Enable User External Storage" : "Įjungti vartotojų išorines saugyklas"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/files_external/l10n/lt_LT.json b/apps/files_external/l10n/lt_LT.json
index a6d6e9bfc72..d196c8e00bd 100644
--- a/apps/files_external/l10n/lt_LT.json
+++ b/apps/files_external/l10n/lt_LT.json
@@ -1,25 +1,26 @@
 { "translations": {
-    "Please provide a valid Dropbox app key and secret." : "Prašome įvesti teisingus Dropbox \"app key\" ir \"secret\".",
     "External storage" : "Išorinė saugykla",
-    "Location" : "Vieta",
+    "Personal" : "Asmeniniai",
+    "Grant access" : "Suteikti priėjimą",
+    "Access granted" : "Priėjimas suteiktas",
+    "None" : "Nieko",
+    "Username" : "Prisijungimo vardas",
+    "Password" : "Slaptažodis",
+    "API key" : "API raktas",
     "Port" : "Prievadas",
     "Region" : "Regionas",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Host" : "Mazgas",
-    "Username" : "Prisijungimo vardas",
-    "Password" : "Slaptažodis",
+    "Location" : "Vieta",
+    "ownCloud" : "ownCloud",
     "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",
+    "Add storage" : "Pridėti saugyklą",
     "Enable User External Storage" : "Įjungti vartotojų išorines saugyklas"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/lv.js b/apps/files_external/l10n/lv.js
index 8b3dae5e4fb..2f694de2249 100644
--- a/apps/files_external/l10n/lv.js
+++ b/apps/files_external/l10n/lv.js
@@ -1,27 +1,27 @@
 OC.L10N.register(
     "files_external",
     {
-    "Please provide a valid Dropbox app key and secret." : "Lūdzu, norādiet derīgu Dropbox lietotnes atslēgu un noslēpumu.",
     "External storage" : "Ārējā krātuve",
-    "Location" : "Vieta",
-    "Port" : "Ports",
-    "Host" : "Resursdators",
+    "Personal" : "Personīgi",
+    "Grant access" : "Piešķirt pieeju",
+    "Access granted" : "Piešķirta pieeja",
+    "Saved" : "Saglabāts",
+    "None" : "Nav",
     "Username" : "Lietotājvārds",
     "Password" : "Parole",
-    "Share" : "Dalīties",
+    "Port" : "Ports",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
-    "Access granted" : "Piešķirta pieeja",
-    "Error configuring Dropbox storage" : "Kļūda, konfigurējot Dropbox krātuvi",
-    "Grant access" : "Piešķirt pieeju",
-    "Error configuring Google Drive storage" : "Kļūda, konfigurējot Google Drive krātuvi",
-    "Personal" : "Personīgi",
-    "Saved" : "Saglabāts",
+    "Host" : "Resursdators",
+    "Location" : "Vieta",
+    "ownCloud" : "ownCloud",
+    "Share" : "Dalīties",
     "Name" : "Nosaukums",
     "External Storage" : "Ārējā krātuve",
     "Folder name" : "Mapes nosaukums",
     "Configuration" : "Konfigurācija",
-    "Add storage" : "Pievienot krātuvi",
     "Delete" : "Dzēst",
+    "Add storage" : "Pievienot krātuvi",
     "Enable User External Storage" : "Aktivēt lietotāja ārējo krātuvi"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);");
diff --git a/apps/files_external/l10n/lv.json b/apps/files_external/l10n/lv.json
index 6ec5fad6f90..5b281307ec3 100644
--- a/apps/files_external/l10n/lv.json
+++ b/apps/files_external/l10n/lv.json
@@ -1,25 +1,25 @@
 { "translations": {
-    "Please provide a valid Dropbox app key and secret." : "Lūdzu, norādiet derīgu Dropbox lietotnes atslēgu un noslēpumu.",
     "External storage" : "Ārējā krātuve",
-    "Location" : "Vieta",
-    "Port" : "Ports",
-    "Host" : "Resursdators",
+    "Personal" : "Personīgi",
+    "Grant access" : "Piešķirt pieeju",
+    "Access granted" : "Piešķirta pieeja",
+    "Saved" : "Saglabāts",
+    "None" : "Nav",
     "Username" : "Lietotājvārds",
     "Password" : "Parole",
-    "Share" : "Dalīties",
+    "Port" : "Ports",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
-    "Access granted" : "Piešķirta pieeja",
-    "Error configuring Dropbox storage" : "Kļūda, konfigurējot Dropbox krātuvi",
-    "Grant access" : "Piešķirt pieeju",
-    "Error configuring Google Drive storage" : "Kļūda, konfigurējot Google Drive krātuvi",
-    "Personal" : "Personīgi",
-    "Saved" : "Saglabāts",
+    "Host" : "Resursdators",
+    "Location" : "Vieta",
+    "ownCloud" : "ownCloud",
+    "Share" : "Dalīties",
     "Name" : "Nosaukums",
     "External Storage" : "Ārējā krātuve",
     "Folder name" : "Mapes nosaukums",
     "Configuration" : "Konfigurācija",
-    "Add storage" : "Pievienot krātuvi",
     "Delete" : "Dzēst",
+    "Add storage" : "Pievienot krātuvi",
     "Enable User External Storage" : "Aktivēt lietotāja ārējo krātuvi"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/mk.js b/apps/files_external/l10n/mk.js
index 4250db79d36..3a62a2b580b 100644
--- a/apps/files_external/l10n/mk.js
+++ b/apps/files_external/l10n/mk.js
@@ -1,22 +1,23 @@
 OC.L10N.register(
     "files_external",
     {
-    "Please provide a valid Dropbox app key and secret." : "Ве молам доставите валиден Dropbox клуч и тајна лозинка.",
-    "Local" : "Локален",
-    "Location" : "Локација",
+    "Personal" : "Лично",
+    "Grant access" : "Дозволи пристап",
+    "Access granted" : "Пристапот е дозволен",
+    "Saved" : "Снимено",
+    "None" : "Ништо",
+    "Username" : "Корисничко име",
+    "Password" : "Лозинка",
+    "API key" : "API key",
     "Port" : "Порта",
     "Region" : "Регион",
+    "WebDAV" : "WebDAV",
+    "URL" : "Адреса",
     "Host" : "Домаќин",
-    "Username" : "Корисничко име",
-    "Password" : "Лозинка",
+    "Local" : "Локален",
+    "Location" : "Локација",
+    "ownCloud" : "ownCloud",
     "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" : "Име на папка",
diff --git a/apps/files_external/l10n/mk.json b/apps/files_external/l10n/mk.json
index d216a075b31..9fb0994a604 100644
--- a/apps/files_external/l10n/mk.json
+++ b/apps/files_external/l10n/mk.json
@@ -1,20 +1,21 @@
 { "translations": {
-    "Please provide a valid Dropbox app key and secret." : "Ве молам доставите валиден Dropbox клуч и тајна лозинка.",
-    "Local" : "Локален",
-    "Location" : "Локација",
+    "Personal" : "Лично",
+    "Grant access" : "Дозволи пристап",
+    "Access granted" : "Пристапот е дозволен",
+    "Saved" : "Снимено",
+    "None" : "Ништо",
+    "Username" : "Корисничко име",
+    "Password" : "Лозинка",
+    "API key" : "API key",
     "Port" : "Порта",
     "Region" : "Регион",
+    "WebDAV" : "WebDAV",
+    "URL" : "Адреса",
     "Host" : "Домаќин",
-    "Username" : "Корисничко име",
-    "Password" : "Лозинка",
+    "Local" : "Локален",
+    "Location" : "Локација",
+    "ownCloud" : "ownCloud",
     "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" : "Име на папка",
diff --git a/apps/files_external/l10n/ms_MY.js b/apps/files_external/l10n/ms_MY.js
index e73074f39fd..1b28ef4226a 100644
--- a/apps/files_external/l10n/ms_MY.js
+++ b/apps/files_external/l10n/ms_MY.js
@@ -1,13 +1,14 @@
 OC.L10N.register(
     "files_external",
     {
-    "Location" : "Lokasi",
-    "Region" : "Wilayah",
+    "Personal" : "Peribadi",
     "Username" : "Nama pengguna",
     "Password" : "Kata laluan",
-    "Share" : "Kongsi",
+    "Region" : "Wilayah",
     "URL" : "URL",
-    "Personal" : "Peribadi",
+    "Location" : "Lokasi",
+    "ownCloud" : "ownCloud",
+    "Share" : "Kongsi",
     "Name" : "Nama",
     "Delete" : "Padam"
 },
diff --git a/apps/files_external/l10n/ms_MY.json b/apps/files_external/l10n/ms_MY.json
index 3dbcfc92a75..79293106272 100644
--- a/apps/files_external/l10n/ms_MY.json
+++ b/apps/files_external/l10n/ms_MY.json
@@ -1,11 +1,12 @@
 { "translations": {
-    "Location" : "Lokasi",
-    "Region" : "Wilayah",
+    "Personal" : "Peribadi",
     "Username" : "Nama pengguna",
     "Password" : "Kata laluan",
-    "Share" : "Kongsi",
+    "Region" : "Wilayah",
     "URL" : "URL",
-    "Personal" : "Peribadi",
+    "Location" : "Lokasi",
+    "ownCloud" : "ownCloud",
+    "Share" : "Kongsi",
     "Name" : "Nama",
     "Delete" : "Padam"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/files_external/l10n/my_MM.js b/apps/files_external/l10n/my_MM.js
index d858639143d..427f35f62b8 100644
--- a/apps/files_external/l10n/my_MM.js
+++ b/apps/files_external/l10n/my_MM.js
@@ -1,8 +1,8 @@
 OC.L10N.register(
     "files_external",
     {
-    "Location" : "တည်နေရာ",
     "Username" : "သုံးစွဲသူအမည်",
-    "Password" : "စကားဝှက်"
+    "Password" : "စကားဝှက်",
+    "Location" : "တည်နေရာ"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files_external/l10n/my_MM.json b/apps/files_external/l10n/my_MM.json
index ee8c8165a50..b13ba9dbd17 100644
--- a/apps/files_external/l10n/my_MM.json
+++ b/apps/files_external/l10n/my_MM.json
@@ -1,6 +1,6 @@
 { "translations": {
-    "Location" : "တည်နေရာ",
     "Username" : "သုံးစွဲသူအမည်",
-    "Password" : "စကားဝှက်"
+    "Password" : "စကားဝှက်",
+    "Location" : "တည်နေရာ"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/nb_NO.js b/apps/files_external/l10n/nb_NO.js
index 8faf9719fe7..1401bbe7012 100644
--- a/apps/files_external/l10n/nb_NO.js
+++ b/apps/files_external/l10n/nb_NO.js
@@ -1,59 +1,27 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Henting av henvendelsessymboler feilet. Sjekk at app-nøkkelen og hemmeligheten din for Dropbox stemmer.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Henting av adgangssymboler feilet. Sjekk at app-nøkkelen og hemmeligheten din for Dropbox stemmer.",
-    "Please provide a valid Dropbox app key and secret." : "Vær vennlig å oppgi gyldig Dropbox appnøkkel og hemmelighet.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Henting av henvendelsessymboler feilet. Sjekk at app-nøkkelen og hemmeligheten din stemmer.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Henting av adgangssymboler feilet. Sjekk at app-nøkkelen og hemmeligheten din stemmer.",
+    "Please provide a valid app key and secret." : "Vær vennlig å oppgi gyldig appnøkkel og hemmelighet.",
     "Step 1 failed. Exception: %s" : "Steg 1 feilet. Unntak: %s",
     "Step 2 failed. Exception: %s" : "Steg 2 feilet. Unntak: %s",
     "External storage" : "Ekstern lagringsplass",
-    "Local" : "Lokal",
-    "Location" : "Sted",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Key",
-    "Secret" : "Secret",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 og tilsvarende",
-    "Access Key" : "Access Key",
-    "Secret Key" : "Secret Key",
-    "Hostname" : "Servernavn",
-    "Port" : "Port",
-    "Region" : "Området",
-    "Enable SSL" : "Aktiver SSL",
-    "Enable Path Style" : "Aktiver Path Style",
-    "App key" : "App key",
-    "App secret" : "App secret",
-    "Host" : "Tjener",
-    "Username" : "Brukernavn",
-    "Password" : "Passord",
-    "Remote subfolder" : "Ekstern undermappe",
-    "Secure ftps://" : "Sikker ftps://",
-    "Client ID" : "Client ID",
-    "Client secret" : "Client secret",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Region (ikke påkrevet for OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (påkrevet for Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (påkrevet for OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Passord (påkrevet for OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Tjenestenavn (påkrevet for OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL for identity endpoint (påkrevet for OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Tidsavbrudd for HTTP-forespørsler i sekunder",
-    "Share" : "Delt ressurs",
-    "SMB / CIFS using OC login" : "SMB / CIFS med OC-pålogging",
-    "Username as share" : "Brukernavn som share",
-    "URL" : "URL",
-    "Secure https://" : "Sikker https://",
-    "SFTP with secret key login" : "SFTP med hemmelig nøkkel for pålogging",
-    "Public key" : "Offentlig nøkkel",
     "Storage with id \"%i\" not found" : "Lager med id \"%i\" ikke funnet",
+    "Invalid backend or authentication mechanism class" : "Ugyldig server eller type autentiseringsmekanisme",
     "Invalid mount point" : "Ugyldig oppkoblingspunkt",
+    "Objectstore forbidden" : "Objektlager forbudt",
     "Invalid storage backend \"%s\"" : "Ugyldig lagringsserver \"%s\"",
-    "Access granted" : "Tilgang innvilget",
-    "Error configuring Dropbox storage" : "Feil ved konfigurering av Dropbox-lagring",
-    "Grant access" : "Gi tilgang",
-    "Error configuring Google Drive storage" : "Feil med konfigurering av Google Drive",
+    "Unsatisfied backend parameters" : "Noen server-parameter mangler",
+    "Unsatisfied authentication mechanism parameters" : "Noen parametre for autentiseringsmekanisme mangler",
     "Personal" : "Personlig",
     "System" : "System",
+    "Grant access" : "Gi tilgang",
+    "Access granted" : "Tilgang innvilget",
+    "Error configuring OAuth1" : "Feil ved konfigurering av OAuth1",
+    "Error configuring OAuth2" : "Feil ved konfigurering av OAuth2",
+    "Generate keys" : "Generer nøkler",
+    "Error generating key pair" : "Feil ved nøkkelgenerering",
     "Enable encryption" : "Aktiver kryptering",
     "Enable previews" : "Tillat fohåndsvisning",
     "Check for changes" : "Se etter endringer",
@@ -63,10 +31,48 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Alle brukere. Tast for å velge bruker eller gruppe.",
     "(group)" : "(gruppe)",
     "Saved" : "Lagret",
-    "Generate keys" : "Generer nøkler",
-    "Error generating key pair" : "Feil ved nøkkelgenerering",
+    "Access key" : "Tilgangsnøkkel",
+    "Secret key" : "Hemmelig nøkkel",
+    "Builtin" : "Innebygget",
+    "None" : "Ingen",
+    "OAuth1" : "OAuth1",
+    "App key" : "App key",
+    "App secret" : "App secret",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "Client ID",
+    "Client secret" : "Client secret",
+    "Username" : "Brukernavn",
+    "Password" : "Passord",
+    "API key" : "API-nøkkel",
+    "Username and password" : "Brukernavn og passord",
+    "Session credentials" : "Påloggingsdetaljer for økt",
+    "Public key" : "Offentlig nøkkel",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Servernavn",
+    "Port" : "Port",
+    "Region" : "Området",
+    "Enable SSL" : "Aktiver SSL",
+    "Enable Path Style" : "Aktiver Path Style",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Ekstern undermappe",
+    "Secure https://" : "Sikker https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Tjener",
+    "Secure ftps://" : "Sikker ftps://",
+    "Google Drive" : "Google Disk",
+    "Local" : "Lokal",
+    "Location" : "Sted",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Rot",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Delt ressurs",
+    "Username as share" : "Brukernavn som share",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Merk:</b> ",
-    "and" : "og",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Merk:</b> Støtte for cURL i PHP er ikke aktivert eller installert. Oppkobling av %s er ikke mulig. Be systemadministratoren om å installere det.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Merk:</b> FTP-støtte i PHP er ikke slått på eller installert. Kan ikke koble opp %s. Ta kontakt med systemadministratoren for å få dette installert.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Merk:</b> \"%s\" er ikke installert. Oppkobling av %s er ikke mulig. Spør systemadministratoren om å installere det.",
@@ -77,11 +83,12 @@ OC.L10N.register(
     "Scope" : "Omfang",
     "External Storage" : "Ekstern lagring",
     "Folder name" : "Mappenavn",
+    "Authentication" : "Autentisering",
     "Configuration" : "Konfigurasjon",
     "Available for" : "Tilgjengelig for",
-    "Add storage" : "Legg til lagringsplass",
     "Advanced settings" : "Avanserte innstillinger",
     "Delete" : "Slett",
+    "Add storage" : "Legg til lagringsplass",
     "Enable User External Storage" : "Aktiver ekstern lagring for bruker",
     "Allow users to mount the following external storage" : "Tillat brukere å koble opp følgende eksterne lagring"
 },
diff --git a/apps/files_external/l10n/nb_NO.json b/apps/files_external/l10n/nb_NO.json
index c6d566b057a..cf6c2d38f9d 100644
--- a/apps/files_external/l10n/nb_NO.json
+++ b/apps/files_external/l10n/nb_NO.json
@@ -1,57 +1,25 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Henting av henvendelsessymboler feilet. Sjekk at app-nøkkelen og hemmeligheten din for Dropbox stemmer.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Henting av adgangssymboler feilet. Sjekk at app-nøkkelen og hemmeligheten din for Dropbox stemmer.",
-    "Please provide a valid Dropbox app key and secret." : "Vær vennlig å oppgi gyldig Dropbox appnøkkel og hemmelighet.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Henting av henvendelsessymboler feilet. Sjekk at app-nøkkelen og hemmeligheten din stemmer.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Henting av adgangssymboler feilet. Sjekk at app-nøkkelen og hemmeligheten din stemmer.",
+    "Please provide a valid app key and secret." : "Vær vennlig å oppgi gyldig appnøkkel og hemmelighet.",
     "Step 1 failed. Exception: %s" : "Steg 1 feilet. Unntak: %s",
     "Step 2 failed. Exception: %s" : "Steg 2 feilet. Unntak: %s",
     "External storage" : "Ekstern lagringsplass",
-    "Local" : "Lokal",
-    "Location" : "Sted",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Key",
-    "Secret" : "Secret",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 og tilsvarende",
-    "Access Key" : "Access Key",
-    "Secret Key" : "Secret Key",
-    "Hostname" : "Servernavn",
-    "Port" : "Port",
-    "Region" : "Området",
-    "Enable SSL" : "Aktiver SSL",
-    "Enable Path Style" : "Aktiver Path Style",
-    "App key" : "App key",
-    "App secret" : "App secret",
-    "Host" : "Tjener",
-    "Username" : "Brukernavn",
-    "Password" : "Passord",
-    "Remote subfolder" : "Ekstern undermappe",
-    "Secure ftps://" : "Sikker ftps://",
-    "Client ID" : "Client ID",
-    "Client secret" : "Client secret",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Region (ikke påkrevet for OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (påkrevet for Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (påkrevet for OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Passord (påkrevet for OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Tjenestenavn (påkrevet for OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL for identity endpoint (påkrevet for OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Tidsavbrudd for HTTP-forespørsler i sekunder",
-    "Share" : "Delt ressurs",
-    "SMB / CIFS using OC login" : "SMB / CIFS med OC-pålogging",
-    "Username as share" : "Brukernavn som share",
-    "URL" : "URL",
-    "Secure https://" : "Sikker https://",
-    "SFTP with secret key login" : "SFTP med hemmelig nøkkel for pålogging",
-    "Public key" : "Offentlig nøkkel",
     "Storage with id \"%i\" not found" : "Lager med id \"%i\" ikke funnet",
+    "Invalid backend or authentication mechanism class" : "Ugyldig server eller type autentiseringsmekanisme",
     "Invalid mount point" : "Ugyldig oppkoblingspunkt",
+    "Objectstore forbidden" : "Objektlager forbudt",
     "Invalid storage backend \"%s\"" : "Ugyldig lagringsserver \"%s\"",
-    "Access granted" : "Tilgang innvilget",
-    "Error configuring Dropbox storage" : "Feil ved konfigurering av Dropbox-lagring",
-    "Grant access" : "Gi tilgang",
-    "Error configuring Google Drive storage" : "Feil med konfigurering av Google Drive",
+    "Unsatisfied backend parameters" : "Noen server-parameter mangler",
+    "Unsatisfied authentication mechanism parameters" : "Noen parametre for autentiseringsmekanisme mangler",
     "Personal" : "Personlig",
     "System" : "System",
+    "Grant access" : "Gi tilgang",
+    "Access granted" : "Tilgang innvilget",
+    "Error configuring OAuth1" : "Feil ved konfigurering av OAuth1",
+    "Error configuring OAuth2" : "Feil ved konfigurering av OAuth2",
+    "Generate keys" : "Generer nøkler",
+    "Error generating key pair" : "Feil ved nøkkelgenerering",
     "Enable encryption" : "Aktiver kryptering",
     "Enable previews" : "Tillat fohåndsvisning",
     "Check for changes" : "Se etter endringer",
@@ -61,10 +29,48 @@
     "All users. Type to select user or group." : "Alle brukere. Tast for å velge bruker eller gruppe.",
     "(group)" : "(gruppe)",
     "Saved" : "Lagret",
-    "Generate keys" : "Generer nøkler",
-    "Error generating key pair" : "Feil ved nøkkelgenerering",
+    "Access key" : "Tilgangsnøkkel",
+    "Secret key" : "Hemmelig nøkkel",
+    "Builtin" : "Innebygget",
+    "None" : "Ingen",
+    "OAuth1" : "OAuth1",
+    "App key" : "App key",
+    "App secret" : "App secret",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "Client ID",
+    "Client secret" : "Client secret",
+    "Username" : "Brukernavn",
+    "Password" : "Passord",
+    "API key" : "API-nøkkel",
+    "Username and password" : "Brukernavn og passord",
+    "Session credentials" : "Påloggingsdetaljer for økt",
+    "Public key" : "Offentlig nøkkel",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Servernavn",
+    "Port" : "Port",
+    "Region" : "Området",
+    "Enable SSL" : "Aktiver SSL",
+    "Enable Path Style" : "Aktiver Path Style",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Ekstern undermappe",
+    "Secure https://" : "Sikker https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Tjener",
+    "Secure ftps://" : "Sikker ftps://",
+    "Google Drive" : "Google Disk",
+    "Local" : "Lokal",
+    "Location" : "Sted",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Rot",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Delt ressurs",
+    "Username as share" : "Brukernavn som share",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Merk:</b> ",
-    "and" : "og",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Merk:</b> Støtte for cURL i PHP er ikke aktivert eller installert. Oppkobling av %s er ikke mulig. Be systemadministratoren om å installere det.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Merk:</b> FTP-støtte i PHP er ikke slått på eller installert. Kan ikke koble opp %s. Ta kontakt med systemadministratoren for å få dette installert.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Merk:</b> \"%s\" er ikke installert. Oppkobling av %s er ikke mulig. Spør systemadministratoren om å installere det.",
@@ -75,11 +81,12 @@
     "Scope" : "Omfang",
     "External Storage" : "Ekstern lagring",
     "Folder name" : "Mappenavn",
+    "Authentication" : "Autentisering",
     "Configuration" : "Konfigurasjon",
     "Available for" : "Tilgjengelig for",
-    "Add storage" : "Legg til lagringsplass",
     "Advanced settings" : "Avanserte innstillinger",
     "Delete" : "Slett",
+    "Add storage" : "Legg til lagringsplass",
     "Enable User External Storage" : "Aktiver ekstern lagring for bruker",
     "Allow users to mount the following external storage" : "Tillat brukere å koble opp følgende eksterne lagring"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/nl.js b/apps/files_external/l10n/nl.js
index dbfdb3bef6a..1f0c219c51e 100644
--- a/apps/files_external/l10n/nl.js
+++ b/apps/files_external/l10n/nl.js
@@ -1,59 +1,27 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Ophalen aanvraag tokens mislukt. Verifieer dat uw Dropbox app key en secret juist zijn.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Ophalen aanvraag tokens mislukt. Verifieer dat uw Dropbox app key en secret juist zijn.",
-    "Please provide a valid Dropbox app key and secret." : "Geef een geldige Dropbox key en secret.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Ophalen aanvraag tokens mislukt. Verifieer dat uw app sleutel en geheime sleutel juist zijn.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Ophalen toegangstokens mislukt. Verifieer dat uw app sleutel en geheime sleutel juist zijn.",
+    "Please provide a valid app key and secret." : "Geef een geldige app sleutel en geheime sleutel op.",
     "Step 1 failed. Exception: %s" : "Stap 1 is mislukt. Uitzondering: %s",
     "Step 2 failed. Exception: %s" : "Stap 2 is mislukt. Uitzondering: %s",
     "External storage" : "Externe opslag",
-    "Local" : "Lokaal",
-    "Location" : "Locatie",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Sleutel",
-    "Secret" : "Geheim",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 en overeenkomstig",
-    "Access Key" : "Access Key",
-    "Secret Key" : "Secret Key",
-    "Hostname" : "Hostnaam",
-    "Port" : "Poort",
-    "Region" : "Regio",
-    "Enable SSL" : "Activeren SSL",
-    "Enable Path Style" : "Activeren pad stijl",
-    "App key" : "App key",
-    "App secret" : "App secret",
-    "Host" : "Host",
-    "Username" : "Gebruikersnaam",
-    "Password" : "Wachtwoord",
-    "Remote subfolder" : "Externe submap",
-    "Secure ftps://" : "Secure ftps://",
-    "Client ID" : "Client ID",
-    "Client secret" : "Client secret",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Regio (optioneel voor OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (verplicht voor Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (Verplicht voor OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Wachtwoord (verplicht voor OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Service Name (verplicht voor OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL van identity endpoint (verplicht voor OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Time-out van HTTP-verzoeken in seconden",
-    "Share" : "Share",
-    "SMB / CIFS using OC login" : "SMB / CIFS via OC inlog",
-    "Username as share" : "Gebruikersnaam als share",
-    "URL" : "URL",
-    "Secure https://" : "Secure https://",
-    "SFTP with secret key login" : "SFTP met geheime sleutel inlog",
-    "Public key" : "Publieke sleutel",
     "Storage with id \"%i\" not found" : "Opslag met id \"%i\" niet gevonden",
+    "Invalid backend or authentication mechanism class" : "Ongeldige backend of authenticatie mechanisme klasse",
     "Invalid mount point" : "Ongeldig aankoppelpunt",
+    "Objectstore forbidden" : "Objectopslag verboden",
     "Invalid storage backend \"%s\"" : "Ongeldig opslagsysteem \"%s\"",
-    "Access granted" : "Toegang toegestaan",
-    "Error configuring Dropbox storage" : "Fout tijdens het configureren van Dropbox opslag",
-    "Grant access" : "Sta toegang toe",
-    "Error configuring Google Drive storage" : "Fout tijdens het configureren van Google Drive opslag",
+    "Unsatisfied backend parameters" : "Onvoldoende backend parameters",
+    "Unsatisfied authentication mechanism parameters" : "Onvoldoende authenticatiemechanisme parameters",
     "Personal" : "Persoonlijk",
     "System" : "Systeem",
+    "Grant access" : "Sta toegang toe",
+    "Access granted" : "Toegang toegestaan",
+    "Error configuring OAuth1" : "Fout bij configureren OAuth1",
+    "Error configuring OAuth2" : "Fout bij configureren OAuth2",
+    "Generate keys" : "Genereer sleutels",
+    "Error generating key pair" : "Fout bij genereren sleutelpaar",
     "Enable encryption" : "Versleuteling inschakelen",
     "Enable previews" : "Activeren voorbeelden",
     "Check for changes" : "Controleren op wijzigingen",
@@ -63,10 +31,48 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Alle gebruikers. Tikken om een gebruiker of groep te selecteren.",
     "(group)" : "(groep)",
     "Saved" : "Bewaard",
-    "Generate keys" : "Genereer sleutels",
-    "Error generating key pair" : "Fout bij genereren sleutelpaar",
+    "Access key" : "Access Key",
+    "Secret key" : "Geheime sleutel",
+    "Builtin" : "Ingebouwd",
+    "None" : "Geen",
+    "OAuth1" : "OAuth1",
+    "App key" : "App key",
+    "App secret" : "App secret",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "Client ID",
+    "Client secret" : "Client secret",
+    "Username" : "Gebruikersnaam",
+    "Password" : "Wachtwoord",
+    "API key" : "API sleutel",
+    "Username and password" : "Gebruikersnaam en wachtwoord",
+    "Session credentials" : "Sessie inloggegevens",
+    "Public key" : "Publieke sleutel",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Hostnaam",
+    "Port" : "Poort",
+    "Region" : "Regio",
+    "Enable SSL" : "Activeren SSL",
+    "Enable Path Style" : "Activeren pad stijl",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Externe submap",
+    "Secure https://" : "Secure https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Host",
+    "Secure ftps://" : "Secure ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Lokaal",
+    "Location" : "Locatie",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Root",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Share",
+    "Username as share" : "Gebruikersnaam als share",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Let op:</b> ",
-    "and" : "en",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Let op:</b> Curl ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw systeembeheerder dit te installeren.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Let op:</b> FTP ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw beheerder dit te installeren.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Let op:</b> \"%s\" is niet geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw beheerder om dit te installeren.",
@@ -77,11 +83,12 @@ OC.L10N.register(
     "Scope" : "Scope",
     "External Storage" : "Externe opslag",
     "Folder name" : "Mapnaam",
+    "Authentication" : "Authenticatie",
     "Configuration" : "Configuratie",
     "Available for" : "Beschikbaar voor",
-    "Add storage" : "Toevoegen opslag",
     "Advanced settings" : "Geavanceerde instellingen",
     "Delete" : "Verwijder",
+    "Add storage" : "Toevoegen opslag",
     "Enable User External Storage" : "Externe opslag voor gebruikers activeren",
     "Allow users to mount the following external storage" : "Sta gebruikers toe de volgende externe opslag aan te koppelen"
 },
diff --git a/apps/files_external/l10n/nl.json b/apps/files_external/l10n/nl.json
index b3912b38a18..948845cfa82 100644
--- a/apps/files_external/l10n/nl.json
+++ b/apps/files_external/l10n/nl.json
@@ -1,57 +1,25 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Ophalen aanvraag tokens mislukt. Verifieer dat uw Dropbox app key en secret juist zijn.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Ophalen aanvraag tokens mislukt. Verifieer dat uw Dropbox app key en secret juist zijn.",
-    "Please provide a valid Dropbox app key and secret." : "Geef een geldige Dropbox key en secret.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Ophalen aanvraag tokens mislukt. Verifieer dat uw app sleutel en geheime sleutel juist zijn.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Ophalen toegangstokens mislukt. Verifieer dat uw app sleutel en geheime sleutel juist zijn.",
+    "Please provide a valid app key and secret." : "Geef een geldige app sleutel en geheime sleutel op.",
     "Step 1 failed. Exception: %s" : "Stap 1 is mislukt. Uitzondering: %s",
     "Step 2 failed. Exception: %s" : "Stap 2 is mislukt. Uitzondering: %s",
     "External storage" : "Externe opslag",
-    "Local" : "Lokaal",
-    "Location" : "Locatie",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Sleutel",
-    "Secret" : "Geheim",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 en overeenkomstig",
-    "Access Key" : "Access Key",
-    "Secret Key" : "Secret Key",
-    "Hostname" : "Hostnaam",
-    "Port" : "Poort",
-    "Region" : "Regio",
-    "Enable SSL" : "Activeren SSL",
-    "Enable Path Style" : "Activeren pad stijl",
-    "App key" : "App key",
-    "App secret" : "App secret",
-    "Host" : "Host",
-    "Username" : "Gebruikersnaam",
-    "Password" : "Wachtwoord",
-    "Remote subfolder" : "Externe submap",
-    "Secure ftps://" : "Secure ftps://",
-    "Client ID" : "Client ID",
-    "Client secret" : "Client secret",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Regio (optioneel voor OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (verplicht voor Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (Verplicht voor OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Wachtwoord (verplicht voor OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Service Name (verplicht voor OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL van identity endpoint (verplicht voor OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Time-out van HTTP-verzoeken in seconden",
-    "Share" : "Share",
-    "SMB / CIFS using OC login" : "SMB / CIFS via OC inlog",
-    "Username as share" : "Gebruikersnaam als share",
-    "URL" : "URL",
-    "Secure https://" : "Secure https://",
-    "SFTP with secret key login" : "SFTP met geheime sleutel inlog",
-    "Public key" : "Publieke sleutel",
     "Storage with id \"%i\" not found" : "Opslag met id \"%i\" niet gevonden",
+    "Invalid backend or authentication mechanism class" : "Ongeldige backend of authenticatie mechanisme klasse",
     "Invalid mount point" : "Ongeldig aankoppelpunt",
+    "Objectstore forbidden" : "Objectopslag verboden",
     "Invalid storage backend \"%s\"" : "Ongeldig opslagsysteem \"%s\"",
-    "Access granted" : "Toegang toegestaan",
-    "Error configuring Dropbox storage" : "Fout tijdens het configureren van Dropbox opslag",
-    "Grant access" : "Sta toegang toe",
-    "Error configuring Google Drive storage" : "Fout tijdens het configureren van Google Drive opslag",
+    "Unsatisfied backend parameters" : "Onvoldoende backend parameters",
+    "Unsatisfied authentication mechanism parameters" : "Onvoldoende authenticatiemechanisme parameters",
     "Personal" : "Persoonlijk",
     "System" : "Systeem",
+    "Grant access" : "Sta toegang toe",
+    "Access granted" : "Toegang toegestaan",
+    "Error configuring OAuth1" : "Fout bij configureren OAuth1",
+    "Error configuring OAuth2" : "Fout bij configureren OAuth2",
+    "Generate keys" : "Genereer sleutels",
+    "Error generating key pair" : "Fout bij genereren sleutelpaar",
     "Enable encryption" : "Versleuteling inschakelen",
     "Enable previews" : "Activeren voorbeelden",
     "Check for changes" : "Controleren op wijzigingen",
@@ -61,10 +29,48 @@
     "All users. Type to select user or group." : "Alle gebruikers. Tikken om een gebruiker of groep te selecteren.",
     "(group)" : "(groep)",
     "Saved" : "Bewaard",
-    "Generate keys" : "Genereer sleutels",
-    "Error generating key pair" : "Fout bij genereren sleutelpaar",
+    "Access key" : "Access Key",
+    "Secret key" : "Geheime sleutel",
+    "Builtin" : "Ingebouwd",
+    "None" : "Geen",
+    "OAuth1" : "OAuth1",
+    "App key" : "App key",
+    "App secret" : "App secret",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "Client ID",
+    "Client secret" : "Client secret",
+    "Username" : "Gebruikersnaam",
+    "Password" : "Wachtwoord",
+    "API key" : "API sleutel",
+    "Username and password" : "Gebruikersnaam en wachtwoord",
+    "Session credentials" : "Sessie inloggegevens",
+    "Public key" : "Publieke sleutel",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Hostnaam",
+    "Port" : "Poort",
+    "Region" : "Regio",
+    "Enable SSL" : "Activeren SSL",
+    "Enable Path Style" : "Activeren pad stijl",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Externe submap",
+    "Secure https://" : "Secure https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Host",
+    "Secure ftps://" : "Secure ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Lokaal",
+    "Location" : "Locatie",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Root",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Share",
+    "Username as share" : "Gebruikersnaam als share",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Let op:</b> ",
-    "and" : "en",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Let op:</b> Curl ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw systeembeheerder dit te installeren.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Let op:</b> FTP ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw beheerder dit te installeren.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Let op:</b> \"%s\" is niet geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw beheerder om dit te installeren.",
@@ -75,11 +81,12 @@
     "Scope" : "Scope",
     "External Storage" : "Externe opslag",
     "Folder name" : "Mapnaam",
+    "Authentication" : "Authenticatie",
     "Configuration" : "Configuratie",
     "Available for" : "Beschikbaar voor",
-    "Add storage" : "Toevoegen opslag",
     "Advanced settings" : "Geavanceerde instellingen",
     "Delete" : "Verwijder",
+    "Add storage" : "Toevoegen opslag",
     "Enable User External Storage" : "Externe opslag voor gebruikers activeren",
     "Allow users to mount the following external storage" : "Sta gebruikers toe de volgende externe opslag aan te koppelen"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/nn_NO.js b/apps/files_external/l10n/nn_NO.js
index 080f510546a..325a8a57528 100644
--- a/apps/files_external/l10n/nn_NO.js
+++ b/apps/files_external/l10n/nn_NO.js
@@ -1,14 +1,16 @@
 OC.L10N.register(
     "files_external",
     {
-    "Location" : "Stad",
-    "Region" : "Region/fylke",
-    "Host" : "Tenar",
+    "Personal" : "Personleg",
     "Username" : "Brukarnamn",
     "Password" : "Passord",
-    "Share" : "Del",
+    "Region" : "Region/fylke",
+    "WebDAV" : "WebDAV",
     "URL" : "Nettstad",
-    "Personal" : "Personleg",
+    "Host" : "Tenar",
+    "Location" : "Stad",
+    "ownCloud" : "ownCloud",
+    "Share" : "Del",
     "Name" : "Namn",
     "Folder name" : "Mappenamn",
     "Configuration" : "Innstillingar",
diff --git a/apps/files_external/l10n/nn_NO.json b/apps/files_external/l10n/nn_NO.json
index 1451532c222..26e6c02d806 100644
--- a/apps/files_external/l10n/nn_NO.json
+++ b/apps/files_external/l10n/nn_NO.json
@@ -1,12 +1,14 @@
 { "translations": {
-    "Location" : "Stad",
-    "Region" : "Region/fylke",
-    "Host" : "Tenar",
+    "Personal" : "Personleg",
     "Username" : "Brukarnamn",
     "Password" : "Passord",
-    "Share" : "Del",
+    "Region" : "Region/fylke",
+    "WebDAV" : "WebDAV",
     "URL" : "Nettstad",
-    "Personal" : "Personleg",
+    "Host" : "Tenar",
+    "Location" : "Stad",
+    "ownCloud" : "ownCloud",
+    "Share" : "Del",
     "Name" : "Namn",
     "Folder name" : "Mappenamn",
     "Configuration" : "Innstillingar",
diff --git a/apps/files_external/l10n/oc.js b/apps/files_external/l10n/oc.js
index 590e6185bdc..d234d0c62c1 100644
--- a/apps/files_external/l10n/oc.js
+++ b/apps/files_external/l10n/oc.js
@@ -1,66 +1,49 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "La recuperacion dels getons d’autentificacion a fracassat. Verificatz vòstra clau d'aplicacion Dropbox amai lo senhal.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "La requèsta d’accès als getons d’autentificacion a fracassat. Verificatz vòstra App-Key Dropbox amai lo senhal.",
-    "Please provide a valid Dropbox app key and secret." : "Provesissètz una clau d'aplicacion (app key) amai un senhal valids.",
     "Step 1 failed. Exception: %s" : "L’etapa 1 a fracassat. Error : %s",
     "Step 2 failed. Exception: %s" : "L’etapa 2 a fracassat. Error : %s",
     "External storage" : "Emmagazinatge extèrne",
-    "Local" : "Local",
-    "Location" : "Emplaçament",
+    "Storage with id \"%i\" not found" : "Emmagazinatge amb l'id \"%i\" pas trobat",
+    "Invalid mount point" : "Punt de montatge invalid",
+    "Invalid storage backend \"%s\"" : "Servici d'emmagazinatge invalid : \"%s\"",
+    "Personal" : "Personal",
+    "System" : "Sistèma",
+    "Grant access" : "Autorizar l'accès",
+    "Access granted" : "Accès autorizat",
+    "Generate keys" : "Generar de claus",
+    "Error generating key pair" : "Error al moment de la generacion de las claus",
+    "Enable encryption" : "Activar lo chiframent",
+    "(group)" : "(grop)",
+    "Saved" : "Salvat",
+    "None" : "Pas cap",
+    "App key" : "App key",
+    "App secret" : "App secret",
+    "Client ID" : "ID Client",
+    "Client secret" : "Secret client",
+    "Username" : "Nom d'utilizaire",
+    "Password" : "Senhal",
+    "Public key" : "Clau publica",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Clau",
-    "Secret" : "Secret",
     "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 e compatibles",
-    "Access Key" : "Clau d'accès",
-    "Secret Key" : "Clau secreta",
     "Hostname" : "Nom de l'òste",
     "Port" : "Pòrt",
     "Region" : "Region",
     "Enable SSL" : "Activar SSL",
     "Enable Path Style" : "Accès per path",
-    "App key" : "App key",
-    "App secret" : "App secret",
-    "Host" : "Òste",
-    "Username" : "Nom d'utilizaire",
-    "Password" : "Senhal",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Remote subfolder" : "Sosdorsièr distant",
+    "Secure https://" : "Securizacion https://",
+    "Host" : "Òste",
     "Secure ftps://" : "Securizacion ftps://",
-    "Client ID" : "ID Client",
-    "Client secret" : "Secret client",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Region (opcional per OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Clau API (requesit per Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nom del locatari (requesit per l'emmagazinatge OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Senhal (requesit per OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nom del servici (requesit per l'emmagazinatge OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL del punt d'accès d'identitat (requesit per l'emmagazinatge OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Relmabi d'espèra maximal de las requèstas HTTP en segondas",
+    "Local" : "Local",
+    "Location" : "Emplaçament",
+    "ownCloud" : "ownCloud",
     "Share" : "Partejar",
-    "SMB / CIFS using OC login" : "SMB / CIFS en utilizant los identificants OC",
     "Username as share" : "Nom d'utilizaire coma nom de partiment",
-    "URL" : "URL",
-    "Secure https://" : "Securizacion https://",
-    "SFTP with secret key login" : "SFTP amb un identificant secret",
-    "Public key" : "Clau publica",
-    "Storage with id \"%i\" not found" : "Emmagazinatge amb l'id \"%i\" pas trobat",
-    "Invalid mount point" : "Punt de montatge invalid",
-    "Invalid storage backend \"%s\"" : "Servici d'emmagazinatge invalid : \"%s\"",
-    "Access granted" : "Accès autorizat",
-    "Error configuring Dropbox storage" : "Error al moment de la configuracion de l'emmagazinatge Dropbox",
-    "Grant access" : "Autorizar l'accès",
-    "Error configuring Google Drive storage" : "Error al moment de la configuracion de l'emmagazinatge Google Drive",
-    "Personal" : "Personal",
-    "System" : "Sistèma",
-    "Enable encryption" : "Activar lo chiframent",
-    "(group)" : "(grop)",
-    "Saved" : "Salvat",
-    "Generate keys" : "Generar de claus",
-    "Error generating key pair" : "Error al moment de la generacion de las claus",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Atencion :</b>",
-    "and" : " e ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Atencion :</b> La presa en carga de cURL per PHP es pas activada o installada. Lo montatge de %s es pas possible. Contactatz vòstre administrator sistèma per l'installar.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Atencion : </b> La presa en carga del FTP per PHP es pas activada o installada. Lo montatge de %s es pas possible. Contactatz vòstre administrator sistèma per l'installar.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Atencion : </b> \"%s\" es pas installat. Lo montatge de %s es pas possible. Contactatz vòstre administrator sistèma per l'installar.",
@@ -73,9 +56,9 @@ OC.L10N.register(
     "Folder name" : "Nom del dorsièr",
     "Configuration" : "Configuracion",
     "Available for" : "Disponible per",
-    "Add storage" : "Apondre un supòrt d'emmagazinatge",
     "Advanced settings" : "Paramètres avançats",
     "Delete" : "Suprimir",
+    "Add storage" : "Apondre un supòrt d'emmagazinatge",
     "Enable User External Storage" : "Autorizar los utilizaires a apondre d'emmagazinatges extèrnes",
     "Allow users to mount the following external storage" : "Autorizar los utilizaires a montar los emmagazinatges extèrnes seguents"
 },
diff --git a/apps/files_external/l10n/oc.json b/apps/files_external/l10n/oc.json
index 1696dfa56a9..0dfa95426ca 100644
--- a/apps/files_external/l10n/oc.json
+++ b/apps/files_external/l10n/oc.json
@@ -1,64 +1,47 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "La recuperacion dels getons d’autentificacion a fracassat. Verificatz vòstra clau d'aplicacion Dropbox amai lo senhal.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "La requèsta d’accès als getons d’autentificacion a fracassat. Verificatz vòstra App-Key Dropbox amai lo senhal.",
-    "Please provide a valid Dropbox app key and secret." : "Provesissètz una clau d'aplicacion (app key) amai un senhal valids.",
     "Step 1 failed. Exception: %s" : "L’etapa 1 a fracassat. Error : %s",
     "Step 2 failed. Exception: %s" : "L’etapa 2 a fracassat. Error : %s",
     "External storage" : "Emmagazinatge extèrne",
-    "Local" : "Local",
-    "Location" : "Emplaçament",
+    "Storage with id \"%i\" not found" : "Emmagazinatge amb l'id \"%i\" pas trobat",
+    "Invalid mount point" : "Punt de montatge invalid",
+    "Invalid storage backend \"%s\"" : "Servici d'emmagazinatge invalid : \"%s\"",
+    "Personal" : "Personal",
+    "System" : "Sistèma",
+    "Grant access" : "Autorizar l'accès",
+    "Access granted" : "Accès autorizat",
+    "Generate keys" : "Generar de claus",
+    "Error generating key pair" : "Error al moment de la generacion de las claus",
+    "Enable encryption" : "Activar lo chiframent",
+    "(group)" : "(grop)",
+    "Saved" : "Salvat",
+    "None" : "Pas cap",
+    "App key" : "App key",
+    "App secret" : "App secret",
+    "Client ID" : "ID Client",
+    "Client secret" : "Secret client",
+    "Username" : "Nom d'utilizaire",
+    "Password" : "Senhal",
+    "Public key" : "Clau publica",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Clau",
-    "Secret" : "Secret",
     "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 e compatibles",
-    "Access Key" : "Clau d'accès",
-    "Secret Key" : "Clau secreta",
     "Hostname" : "Nom de l'òste",
     "Port" : "Pòrt",
     "Region" : "Region",
     "Enable SSL" : "Activar SSL",
     "Enable Path Style" : "Accès per path",
-    "App key" : "App key",
-    "App secret" : "App secret",
-    "Host" : "Òste",
-    "Username" : "Nom d'utilizaire",
-    "Password" : "Senhal",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Remote subfolder" : "Sosdorsièr distant",
+    "Secure https://" : "Securizacion https://",
+    "Host" : "Òste",
     "Secure ftps://" : "Securizacion ftps://",
-    "Client ID" : "ID Client",
-    "Client secret" : "Secret client",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Region (opcional per OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Clau API (requesit per Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nom del locatari (requesit per l'emmagazinatge OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Senhal (requesit per OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nom del servici (requesit per l'emmagazinatge OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL del punt d'accès d'identitat (requesit per l'emmagazinatge OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Relmabi d'espèra maximal de las requèstas HTTP en segondas",
+    "Local" : "Local",
+    "Location" : "Emplaçament",
+    "ownCloud" : "ownCloud",
     "Share" : "Partejar",
-    "SMB / CIFS using OC login" : "SMB / CIFS en utilizant los identificants OC",
     "Username as share" : "Nom d'utilizaire coma nom de partiment",
-    "URL" : "URL",
-    "Secure https://" : "Securizacion https://",
-    "SFTP with secret key login" : "SFTP amb un identificant secret",
-    "Public key" : "Clau publica",
-    "Storage with id \"%i\" not found" : "Emmagazinatge amb l'id \"%i\" pas trobat",
-    "Invalid mount point" : "Punt de montatge invalid",
-    "Invalid storage backend \"%s\"" : "Servici d'emmagazinatge invalid : \"%s\"",
-    "Access granted" : "Accès autorizat",
-    "Error configuring Dropbox storage" : "Error al moment de la configuracion de l'emmagazinatge Dropbox",
-    "Grant access" : "Autorizar l'accès",
-    "Error configuring Google Drive storage" : "Error al moment de la configuracion de l'emmagazinatge Google Drive",
-    "Personal" : "Personal",
-    "System" : "Sistèma",
-    "Enable encryption" : "Activar lo chiframent",
-    "(group)" : "(grop)",
-    "Saved" : "Salvat",
-    "Generate keys" : "Generar de claus",
-    "Error generating key pair" : "Error al moment de la generacion de las claus",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Atencion :</b>",
-    "and" : " e ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Atencion :</b> La presa en carga de cURL per PHP es pas activada o installada. Lo montatge de %s es pas possible. Contactatz vòstre administrator sistèma per l'installar.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Atencion : </b> La presa en carga del FTP per PHP es pas activada o installada. Lo montatge de %s es pas possible. Contactatz vòstre administrator sistèma per l'installar.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Atencion : </b> \"%s\" es pas installat. Lo montatge de %s es pas possible. Contactatz vòstre administrator sistèma per l'installar.",
@@ -71,9 +54,9 @@
     "Folder name" : "Nom del dorsièr",
     "Configuration" : "Configuracion",
     "Available for" : "Disponible per",
-    "Add storage" : "Apondre un supòrt d'emmagazinatge",
     "Advanced settings" : "Paramètres avançats",
     "Delete" : "Suprimir",
+    "Add storage" : "Apondre un supòrt d'emmagazinatge",
     "Enable User External Storage" : "Autorizar los utilizaires a apondre d'emmagazinatges extèrnes",
     "Allow users to mount the following external storage" : "Autorizar los utilizaires a montar los emmagazinatges extèrnes seguents"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
diff --git a/apps/files_external/l10n/pa.js b/apps/files_external/l10n/pa.js
index 47acbde23d8..ff376198ae4 100644
--- a/apps/files_external/l10n/pa.js
+++ b/apps/files_external/l10n/pa.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Username" : "ਯੂਜ਼ਰ-ਨਾਂ",
     "Password" : "ਪਾਸਵਰ",
+    "ownCloud" : "ਓਵਨਕਲਾਉਡ",
     "Share" : "ਸਾਂਝਾ ਕਰੋ",
     "Delete" : "ਹਟਾਓ"
 },
diff --git a/apps/files_external/l10n/pa.json b/apps/files_external/l10n/pa.json
index 2bdafd7a25e..a2ba80af130 100644
--- a/apps/files_external/l10n/pa.json
+++ b/apps/files_external/l10n/pa.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Username" : "ਯੂਜ਼ਰ-ਨਾਂ",
     "Password" : "ਪਾਸਵਰ",
+    "ownCloud" : "ਓਵਨਕਲਾਉਡ",
     "Share" : "ਸਾਂਝਾ ਕਰੋ",
     "Delete" : "ਹਟਾਓ"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/pl.js b/apps/files_external/l10n/pl.js
index 1c580075d61..9fb70e71778 100644
--- a/apps/files_external/l10n/pl.js
+++ b/apps/files_external/l10n/pl.js
@@ -1,59 +1,18 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Otrzymano błędne żądanie tokenów. Sprawdź, czy klucz aplikacji oraz klucz poufny Dropbox'a są poprawne.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Otrzymano błędne żądanie tokenów. Sprawdź, czy klucz aplikacji oraz klucz poufny Dropbox'a są poprawne.",
-    "Please provide a valid Dropbox app key and secret." : "Proszę podać prawidłowy klucz aplikacji Dropbox i klucz sekretny.",
     "Step 1 failed. Exception: %s" : "Krok 1 błędny. Błąd: %s",
     "Step 2 failed. Exception: %s" : "Krok 2 błędny. Błąd: %s",
     "External storage" : "Zewnętrzne zasoby dyskowe",
-    "Local" : "Lokalny",
-    "Location" : "Lokalizacja",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Klucz",
-    "Secret" : "Hasło",
-    "Bucket" : "Kosz",
-    "Amazon S3 and compliant" : "Amazon S3 i zgodne",
-    "Access Key" : "Klucz dostępu",
-    "Secret Key" : "Klucz hasła",
-    "Hostname" : "Nazwa serwera",
-    "Port" : "Port",
-    "Region" : "Region",
-    "Enable SSL" : "Włącz SSL",
-    "Enable Path Style" : "Włącz styl ścieżki",
-    "App key" : "Klucz aplikacji",
-    "App secret" : "Hasło aplikacji",
-    "Host" : "Host",
-    "Username" : "Nazwa użytkownika",
-    "Password" : "Hasło",
-    "Remote subfolder" : "Zdalny podfolder",
-    "Secure ftps://" : "Bezpieczny ftps://",
-    "Client ID" : "ID klienta",
-    "Client secret" : "Hasło klienta",
-    "OpenStack Object Storage" : "Magazyn obiektów OpenStack",
-    "Region (optional for OpenStack Object Storage)" : "Region (opcjonalny dla magazynu obiektów OpenStack)",
-    "API Key (required for Rackspace Cloud Files)" : "Klucz API (wymagany dla plików Rackspace Cloud)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nazwa najemcy (wymagana dla magazynu obiektów OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Hasło (wymagane dla magazynu obiektów OpenStack)",
-    "Service Name (required for OpenStack Object Storage)" : "Nazwa usługi (wymagana dla magazynu obiektów OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL lub zakończenie jednostki (wymagane dla magazynu obiektów OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Czas nieaktywności żądania HTTP w sekundach",
-    "Share" : "Udostępnij",
-    "SMB / CIFS using OC login" : "SMB / CIFS przy użyciu loginu OC",
-    "Username as share" : "Użytkownik jako zasób",
-    "URL" : "URL",
-    "Secure https://" : "Bezpieczny https://",
-    "SFTP with secret key login" : "Logowanie tajnym kluczem do SFTP",
-    "Public key" : "Klucz publiczny",
     "Storage with id \"%i\" not found" : "Id magazynu nie został znaleziony",
     "Invalid mount point" : "Nieprawidłowy punkt montowania",
     "Invalid storage backend \"%s\"" : "Nieprawidłowy magazyn zaplecza \"%s\"",
-    "Access granted" : "Dostęp do",
-    "Error configuring Dropbox storage" : "Wystąpił błąd podczas konfigurowania zasobu Dropbox",
-    "Grant access" : "Udziel dostępu",
-    "Error configuring Google Drive storage" : "Wystąpił błąd podczas konfigurowania zasobu Google Drive",
     "Personal" : "Osobiste",
     "System" : "System",
+    "Grant access" : "Udziel dostępu",
+    "Access granted" : "Dostęp do",
+    "Generate keys" : "Wygeneruj klucze",
+    "Error generating key pair" : "Błąd podczas generowania pary kluczy",
     "Enable encryption" : "Włącz szyfrowanie",
     "Enable previews" : "Włącz podgląd",
     "Check for changes" : "Sprawdź zmiany",
@@ -63,10 +22,37 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Wszyscy użytkownicy. Zacznij pisać, aby wybrać użytkownika lub grupę.",
     "(group)" : "(grupa)",
     "Saved" : "Zapisano",
-    "Generate keys" : "Wygeneruj klucze",
-    "Error generating key pair" : "Błąd podczas generowania pary kluczy",
+    "None" : "Nic",
+    "App key" : "Klucz aplikacji",
+    "App secret" : "Hasło aplikacji",
+    "Client ID" : "ID klienta",
+    "Client secret" : "Hasło klienta",
+    "Username" : "Nazwa użytkownika",
+    "Password" : "Hasło",
+    "API key" : "Klucz API",
+    "Public key" : "Klucz publiczny",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Kosz",
+    "Hostname" : "Nazwa serwera",
+    "Port" : "Port",
+    "Region" : "Region",
+    "Enable SSL" : "Włącz SSL",
+    "Enable Path Style" : "Włącz styl ścieżki",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Zdalny podfolder",
+    "Secure https://" : "Bezpieczny https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Host",
+    "Secure ftps://" : "Bezpieczny ftps://",
+    "Local" : "Lokalny",
+    "Location" : "Lokalizacja",
+    "ownCloud" : "ownCloud",
+    "Root" : "Root",
+    "Share" : "Udostępnij",
+    "Username as share" : "Użytkownik jako zasób",
+    "OpenStack Object Storage" : "Magazyn obiektów OpenStack",
     "<b>Note:</b> " : "<b>Uwaga:</b> ",
-    "and" : "i",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Uwaga:</b> Wsparcie dla cURL w PHP nie zostało włączone lub zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Uwaga:</b> Wsparcie dla FTP w PHP nie zostało włączone lub zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Uwaga:</b> \"%s\" nie jest zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go.",
@@ -79,9 +65,9 @@ OC.L10N.register(
     "Folder name" : "Nazwa folderu",
     "Configuration" : "Konfiguracja",
     "Available for" : "Dostępne przez",
-    "Add storage" : "Dodaj zasoby dyskowe",
     "Advanced settings" : "Ustawienia zaawansowane",
     "Delete" : "Usuń",
+    "Add storage" : "Dodaj zasoby dyskowe",
     "Enable User External Storage" : "Włącz zewnętrzne zasoby dyskowe użytkownika",
     "Allow users to mount the following external storage" : "Pozwól użytkownikom montować następujące zewnętrzne zasoby dyskowe"
 },
diff --git a/apps/files_external/l10n/pl.json b/apps/files_external/l10n/pl.json
index dee33026ca6..d7cd70b8c36 100644
--- a/apps/files_external/l10n/pl.json
+++ b/apps/files_external/l10n/pl.json
@@ -1,57 +1,16 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Otrzymano błędne żądanie tokenów. Sprawdź, czy klucz aplikacji oraz klucz poufny Dropbox'a są poprawne.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Otrzymano błędne żądanie tokenów. Sprawdź, czy klucz aplikacji oraz klucz poufny Dropbox'a są poprawne.",
-    "Please provide a valid Dropbox app key and secret." : "Proszę podać prawidłowy klucz aplikacji Dropbox i klucz sekretny.",
     "Step 1 failed. Exception: %s" : "Krok 1 błędny. Błąd: %s",
     "Step 2 failed. Exception: %s" : "Krok 2 błędny. Błąd: %s",
     "External storage" : "Zewnętrzne zasoby dyskowe",
-    "Local" : "Lokalny",
-    "Location" : "Lokalizacja",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Klucz",
-    "Secret" : "Hasło",
-    "Bucket" : "Kosz",
-    "Amazon S3 and compliant" : "Amazon S3 i zgodne",
-    "Access Key" : "Klucz dostępu",
-    "Secret Key" : "Klucz hasła",
-    "Hostname" : "Nazwa serwera",
-    "Port" : "Port",
-    "Region" : "Region",
-    "Enable SSL" : "Włącz SSL",
-    "Enable Path Style" : "Włącz styl ścieżki",
-    "App key" : "Klucz aplikacji",
-    "App secret" : "Hasło aplikacji",
-    "Host" : "Host",
-    "Username" : "Nazwa użytkownika",
-    "Password" : "Hasło",
-    "Remote subfolder" : "Zdalny podfolder",
-    "Secure ftps://" : "Bezpieczny ftps://",
-    "Client ID" : "ID klienta",
-    "Client secret" : "Hasło klienta",
-    "OpenStack Object Storage" : "Magazyn obiektów OpenStack",
-    "Region (optional for OpenStack Object Storage)" : "Region (opcjonalny dla magazynu obiektów OpenStack)",
-    "API Key (required for Rackspace Cloud Files)" : "Klucz API (wymagany dla plików Rackspace Cloud)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nazwa najemcy (wymagana dla magazynu obiektów OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Hasło (wymagane dla magazynu obiektów OpenStack)",
-    "Service Name (required for OpenStack Object Storage)" : "Nazwa usługi (wymagana dla magazynu obiektów OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL lub zakończenie jednostki (wymagane dla magazynu obiektów OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Czas nieaktywności żądania HTTP w sekundach",
-    "Share" : "Udostępnij",
-    "SMB / CIFS using OC login" : "SMB / CIFS przy użyciu loginu OC",
-    "Username as share" : "Użytkownik jako zasób",
-    "URL" : "URL",
-    "Secure https://" : "Bezpieczny https://",
-    "SFTP with secret key login" : "Logowanie tajnym kluczem do SFTP",
-    "Public key" : "Klucz publiczny",
     "Storage with id \"%i\" not found" : "Id magazynu nie został znaleziony",
     "Invalid mount point" : "Nieprawidłowy punkt montowania",
     "Invalid storage backend \"%s\"" : "Nieprawidłowy magazyn zaplecza \"%s\"",
-    "Access granted" : "Dostęp do",
-    "Error configuring Dropbox storage" : "Wystąpił błąd podczas konfigurowania zasobu Dropbox",
-    "Grant access" : "Udziel dostępu",
-    "Error configuring Google Drive storage" : "Wystąpił błąd podczas konfigurowania zasobu Google Drive",
     "Personal" : "Osobiste",
     "System" : "System",
+    "Grant access" : "Udziel dostępu",
+    "Access granted" : "Dostęp do",
+    "Generate keys" : "Wygeneruj klucze",
+    "Error generating key pair" : "Błąd podczas generowania pary kluczy",
     "Enable encryption" : "Włącz szyfrowanie",
     "Enable previews" : "Włącz podgląd",
     "Check for changes" : "Sprawdź zmiany",
@@ -61,10 +20,37 @@
     "All users. Type to select user or group." : "Wszyscy użytkownicy. Zacznij pisać, aby wybrać użytkownika lub grupę.",
     "(group)" : "(grupa)",
     "Saved" : "Zapisano",
-    "Generate keys" : "Wygeneruj klucze",
-    "Error generating key pair" : "Błąd podczas generowania pary kluczy",
+    "None" : "Nic",
+    "App key" : "Klucz aplikacji",
+    "App secret" : "Hasło aplikacji",
+    "Client ID" : "ID klienta",
+    "Client secret" : "Hasło klienta",
+    "Username" : "Nazwa użytkownika",
+    "Password" : "Hasło",
+    "API key" : "Klucz API",
+    "Public key" : "Klucz publiczny",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Kosz",
+    "Hostname" : "Nazwa serwera",
+    "Port" : "Port",
+    "Region" : "Region",
+    "Enable SSL" : "Włącz SSL",
+    "Enable Path Style" : "Włącz styl ścieżki",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Zdalny podfolder",
+    "Secure https://" : "Bezpieczny https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Host",
+    "Secure ftps://" : "Bezpieczny ftps://",
+    "Local" : "Lokalny",
+    "Location" : "Lokalizacja",
+    "ownCloud" : "ownCloud",
+    "Root" : "Root",
+    "Share" : "Udostępnij",
+    "Username as share" : "Użytkownik jako zasób",
+    "OpenStack Object Storage" : "Magazyn obiektów OpenStack",
     "<b>Note:</b> " : "<b>Uwaga:</b> ",
-    "and" : "i",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Uwaga:</b> Wsparcie dla cURL w PHP nie zostało włączone lub zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Uwaga:</b> Wsparcie dla FTP w PHP nie zostało włączone lub zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Uwaga:</b> \"%s\" nie jest zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go.",
@@ -77,9 +63,9 @@
     "Folder name" : "Nazwa folderu",
     "Configuration" : "Konfiguracja",
     "Available for" : "Dostępne przez",
-    "Add storage" : "Dodaj zasoby dyskowe",
     "Advanced settings" : "Ustawienia zaawansowane",
     "Delete" : "Usuń",
+    "Add storage" : "Dodaj zasoby dyskowe",
     "Enable User External Storage" : "Włącz zewnętrzne zasoby dyskowe użytkownika",
     "Allow users to mount the following external storage" : "Pozwól użytkownikom montować następujące zewnętrzne zasoby dyskowe"
 },"pluralForm" :"nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
diff --git a/apps/files_external/l10n/pt_BR.js b/apps/files_external/l10n/pt_BR.js
index c05f2089536..fefe1e899f5 100644
--- a/apps/files_external/l10n/pt_BR.js
+++ b/apps/files_external/l10n/pt_BR.js
@@ -1,59 +1,27 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "A busca de fichas de solicitação falhou. Verifique se a sua chave de aplicativo Dropbox e o segredo estão corretos.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "A busca de tokens de acesso falhou. Verifique se a sua chave de aplicativo Dropbox e o segredo estão corretos.",
-    "Please provide a valid Dropbox app key and secret." : "Por favor forneça uma chave de aplicativo e segurança válidos para o Dropbox",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "A solicitação dos tokens de requesição falhou. Verifique se a sua chave de aplicativo e segurança estão corretos.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "A solicitação dos tokens de acesso falhou. Verifique se a sua chave de aplicativo e segurança estão corretos.",
+    "Please provide a valid app key and secret." : "Por favor forneça uma chave e segurança válidos.",
     "Step 1 failed. Exception: %s" : "Passo 1 falhou. Exceção: %s",
     "Step 2 failed. Exception: %s" : "Passo 2 falhou. Exceção: %s",
     "External storage" : "Armazenamento Externo",
-    "Local" : "Local",
-    "Location" : "Localização",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Chave",
-    "Secret" : "Segredo",
-    "Bucket" : "Cesta",
-    "Amazon S3 and compliant" : "Amazon S3 e compatível",
-    "Access Key" : "Chave de Acesso",
-    "Secret Key" : "Chave Secreta",
-    "Hostname" : "Nome do Host",
-    "Port" : "Porta",
-    "Region" : "Região",
-    "Enable SSL" : "Habilitar SSL",
-    "Enable Path Style" : "Habilitar Estilo do Caminho",
-    "App key" : "Chave do Aplicativo",
-    "App secret" : "Segredo da Aplicação",
-    "Host" : "Host",
-    "Username" : "Nome de Usuário",
-    "Password" : "Senha",
-    "Remote subfolder" : "Subpasta remota",
-    "Secure ftps://" : "Seguro ftps://",
-    "Client ID" : "ID do Cliente",
-    "Client secret" : "Segredo do cliente",
-    "OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
-    "Region (optional for OpenStack Object Storage)" : "Região (opcional para armazenamento de objetos OpenStack)",
-    "API Key (required for Rackspace Cloud Files)" : "Chave API (necessário para Rackspace Cloud File)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nome Tenant (necessário para armazenamento de objetos OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Senha (necessário para armazenamento de objetos OpenStack)",
-    "Service Name (required for OpenStack Object Storage)" : "Nome do Serviço (necessário para armazenamento de objetos OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Ponto final de identidade da URL (obrigatório para armazenamento de objetos OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Tempo de vencimento do pedido HTTP em segundos",
-    "Share" : "Compartilhar",
-    "SMB / CIFS using OC login" : "SMB / CIFS usando OC login",
-    "Username as share" : "Nome de usuário como compartilhado",
-    "URL" : "URL",
-    "Secure https://" : "https:// segura",
-    "SFTP with secret key login" : "SFTP com chave secreta de login",
-    "Public key" : "Chave pública",
     "Storage with id \"%i\" not found" : "Armazenamento com id \"%i\" não encontrado",
+    "Invalid backend or authentication mechanism class" : "Backend inválido ou classe de mecanismo de autenticação",
     "Invalid mount point" : "Ponto de montagem inválido",
+    "Objectstore forbidden" : "Proibido armazenamento de objetos",
     "Invalid storage backend \"%s\"" : "Armazenamento backend inválido \"%s\"",
-    "Access granted" : "Acesso concedido",
-    "Error configuring Dropbox storage" : "Erro ao configurar armazenamento do Dropbox",
-    "Grant access" : "Permitir acesso",
-    "Error configuring Google Drive storage" : "Erro ao configurar armazenamento do Google Drive",
+    "Unsatisfied backend parameters" : "Parâmetros de back-end não-atendidos",
+    "Unsatisfied authentication mechanism parameters" : "Parâmetros de mecanismos de autenticação não satisfeitos",
     "Personal" : "Pessoal",
     "System" : "Sistema",
+    "Grant access" : "Permitir acesso",
+    "Access granted" : "Acesso concedido",
+    "Error configuring OAuth1" : "Erro configurando OAuth1",
+    "Error configuring OAuth2" : "Erro configurando OAuth2",
+    "Generate keys" : "Gerar chaves",
+    "Error generating key pair" : "Erro ao gerar um par de chaves",
     "Enable encryption" : "Ativar criptografia",
     "Enable previews" : "Habilitar visualizações prévias",
     "Check for changes" : "Verifique se há alterações",
@@ -63,10 +31,48 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Todos os usuários. Digite para selecionar usuário ou grupo.",
     "(group)" : "(grupo)",
     "Saved" : "Salvo",
-    "Generate keys" : "Gerar chaves",
-    "Error generating key pair" : "Erro ao gerar um par de chaves",
+    "Access key" : "Chave da acesso",
+    "Secret key" : "Chave secreta",
+    "Builtin" : "Construídas em",
+    "None" : "Nenhum",
+    "OAuth1" : "OAuth1",
+    "App key" : "Chave do Aplicativo",
+    "App secret" : "Segredo da Aplicação",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "ID do Cliente",
+    "Client secret" : "Segredo do cliente",
+    "Username" : "Nome de Usuário",
+    "Password" : "Senha",
+    "API key" : "Chave API",
+    "Username and password" : "Nome de Usuário e senha",
+    "Session credentials" : "Credenciais de Sessão",
+    "Public key" : "Chave pública",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Cesta",
+    "Hostname" : "Nome do Host",
+    "Port" : "Porta",
+    "Region" : "Região",
+    "Enable SSL" : "Habilitar SSL",
+    "Enable Path Style" : "Habilitar Estilo do Caminho",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Subpasta remota",
+    "Secure https://" : "https:// segura",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Host",
+    "Secure ftps://" : "Seguro ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Local",
+    "Location" : "Localização",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Raiz",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Compartilhar",
+    "Username as share" : "Nome de usuário como compartilhado",
+    "OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
     "<b>Note:</b> " : "<b>Nota:</b>",
-    "and" : "e",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> O suporte cURL do PHP não está habilitado ou instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> O suporte FTP no PHP não está habilitado ou instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> \"%s\" não está instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo.",
@@ -77,11 +83,12 @@ OC.L10N.register(
     "Scope" : "Escopo",
     "External Storage" : "Armazenamento Externo",
     "Folder name" : "Nome da pasta",
+    "Authentication" : "Autenticação",
     "Configuration" : "Configuração",
     "Available for" : "Disponível para",
-    "Add storage" : "Adicionar Armazenamento",
     "Advanced settings" : "Configurações avançadas",
     "Delete" : "Excluir",
+    "Add storage" : "Adicionar Armazenamento",
     "Enable User External Storage" : "Habilitar Armazenamento Externo do Usuário",
     "Allow users to mount the following external storage" : "Permitir que usuários montem o seguinte armazenamento externo"
 },
diff --git a/apps/files_external/l10n/pt_BR.json b/apps/files_external/l10n/pt_BR.json
index 92423280fca..f133b469f76 100644
--- a/apps/files_external/l10n/pt_BR.json
+++ b/apps/files_external/l10n/pt_BR.json
@@ -1,57 +1,25 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "A busca de fichas de solicitação falhou. Verifique se a sua chave de aplicativo Dropbox e o segredo estão corretos.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "A busca de tokens de acesso falhou. Verifique se a sua chave de aplicativo Dropbox e o segredo estão corretos.",
-    "Please provide a valid Dropbox app key and secret." : "Por favor forneça uma chave de aplicativo e segurança válidos para o Dropbox",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "A solicitação dos tokens de requesição falhou. Verifique se a sua chave de aplicativo e segurança estão corretos.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "A solicitação dos tokens de acesso falhou. Verifique se a sua chave de aplicativo e segurança estão corretos.",
+    "Please provide a valid app key and secret." : "Por favor forneça uma chave e segurança válidos.",
     "Step 1 failed. Exception: %s" : "Passo 1 falhou. Exceção: %s",
     "Step 2 failed. Exception: %s" : "Passo 2 falhou. Exceção: %s",
     "External storage" : "Armazenamento Externo",
-    "Local" : "Local",
-    "Location" : "Localização",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Chave",
-    "Secret" : "Segredo",
-    "Bucket" : "Cesta",
-    "Amazon S3 and compliant" : "Amazon S3 e compatível",
-    "Access Key" : "Chave de Acesso",
-    "Secret Key" : "Chave Secreta",
-    "Hostname" : "Nome do Host",
-    "Port" : "Porta",
-    "Region" : "Região",
-    "Enable SSL" : "Habilitar SSL",
-    "Enable Path Style" : "Habilitar Estilo do Caminho",
-    "App key" : "Chave do Aplicativo",
-    "App secret" : "Segredo da Aplicação",
-    "Host" : "Host",
-    "Username" : "Nome de Usuário",
-    "Password" : "Senha",
-    "Remote subfolder" : "Subpasta remota",
-    "Secure ftps://" : "Seguro ftps://",
-    "Client ID" : "ID do Cliente",
-    "Client secret" : "Segredo do cliente",
-    "OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
-    "Region (optional for OpenStack Object Storage)" : "Região (opcional para armazenamento de objetos OpenStack)",
-    "API Key (required for Rackspace Cloud Files)" : "Chave API (necessário para Rackspace Cloud File)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nome Tenant (necessário para armazenamento de objetos OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Senha (necessário para armazenamento de objetos OpenStack)",
-    "Service Name (required for OpenStack Object Storage)" : "Nome do Serviço (necessário para armazenamento de objetos OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Ponto final de identidade da URL (obrigatório para armazenamento de objetos OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Tempo de vencimento do pedido HTTP em segundos",
-    "Share" : "Compartilhar",
-    "SMB / CIFS using OC login" : "SMB / CIFS usando OC login",
-    "Username as share" : "Nome de usuário como compartilhado",
-    "URL" : "URL",
-    "Secure https://" : "https:// segura",
-    "SFTP with secret key login" : "SFTP com chave secreta de login",
-    "Public key" : "Chave pública",
     "Storage with id \"%i\" not found" : "Armazenamento com id \"%i\" não encontrado",
+    "Invalid backend or authentication mechanism class" : "Backend inválido ou classe de mecanismo de autenticação",
     "Invalid mount point" : "Ponto de montagem inválido",
+    "Objectstore forbidden" : "Proibido armazenamento de objetos",
     "Invalid storage backend \"%s\"" : "Armazenamento backend inválido \"%s\"",
-    "Access granted" : "Acesso concedido",
-    "Error configuring Dropbox storage" : "Erro ao configurar armazenamento do Dropbox",
-    "Grant access" : "Permitir acesso",
-    "Error configuring Google Drive storage" : "Erro ao configurar armazenamento do Google Drive",
+    "Unsatisfied backend parameters" : "Parâmetros de back-end não-atendidos",
+    "Unsatisfied authentication mechanism parameters" : "Parâmetros de mecanismos de autenticação não satisfeitos",
     "Personal" : "Pessoal",
     "System" : "Sistema",
+    "Grant access" : "Permitir acesso",
+    "Access granted" : "Acesso concedido",
+    "Error configuring OAuth1" : "Erro configurando OAuth1",
+    "Error configuring OAuth2" : "Erro configurando OAuth2",
+    "Generate keys" : "Gerar chaves",
+    "Error generating key pair" : "Erro ao gerar um par de chaves",
     "Enable encryption" : "Ativar criptografia",
     "Enable previews" : "Habilitar visualizações prévias",
     "Check for changes" : "Verifique se há alterações",
@@ -61,10 +29,48 @@
     "All users. Type to select user or group." : "Todos os usuários. Digite para selecionar usuário ou grupo.",
     "(group)" : "(grupo)",
     "Saved" : "Salvo",
-    "Generate keys" : "Gerar chaves",
-    "Error generating key pair" : "Erro ao gerar um par de chaves",
+    "Access key" : "Chave da acesso",
+    "Secret key" : "Chave secreta",
+    "Builtin" : "Construídas em",
+    "None" : "Nenhum",
+    "OAuth1" : "OAuth1",
+    "App key" : "Chave do Aplicativo",
+    "App secret" : "Segredo da Aplicação",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "ID do Cliente",
+    "Client secret" : "Segredo do cliente",
+    "Username" : "Nome de Usuário",
+    "Password" : "Senha",
+    "API key" : "Chave API",
+    "Username and password" : "Nome de Usuário e senha",
+    "Session credentials" : "Credenciais de Sessão",
+    "Public key" : "Chave pública",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Cesta",
+    "Hostname" : "Nome do Host",
+    "Port" : "Porta",
+    "Region" : "Região",
+    "Enable SSL" : "Habilitar SSL",
+    "Enable Path Style" : "Habilitar Estilo do Caminho",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Subpasta remota",
+    "Secure https://" : "https:// segura",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Host",
+    "Secure ftps://" : "Seguro ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Local",
+    "Location" : "Localização",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Raiz",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Compartilhar",
+    "Username as share" : "Nome de usuário como compartilhado",
+    "OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
     "<b>Note:</b> " : "<b>Nota:</b>",
-    "and" : "e",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> O suporte cURL do PHP não está habilitado ou instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> O suporte FTP no PHP não está habilitado ou instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> \"%s\" não está instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo.",
@@ -75,11 +81,12 @@
     "Scope" : "Escopo",
     "External Storage" : "Armazenamento Externo",
     "Folder name" : "Nome da pasta",
+    "Authentication" : "Autenticação",
     "Configuration" : "Configuração",
     "Available for" : "Disponível para",
-    "Add storage" : "Adicionar Armazenamento",
     "Advanced settings" : "Configurações avançadas",
     "Delete" : "Excluir",
+    "Add storage" : "Adicionar Armazenamento",
     "Enable User External Storage" : "Habilitar Armazenamento Externo do Usuário",
     "Allow users to mount the following external storage" : "Permitir que usuários montem o seguinte armazenamento externo"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
diff --git a/apps/files_external/l10n/pt_PT.js b/apps/files_external/l10n/pt_PT.js
index 7e41105bfe2..ba1d86a40d0 100644
--- a/apps/files_external/l10n/pt_PT.js
+++ b/apps/files_external/l10n/pt_PT.js
@@ -1,65 +1,75 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "O pedido de obtenção falhou. Verifique se a sua chave da app Dropbox e o segredo estão corretos.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "O pedido de obtenção falhou. Verifique se a sua chave da app Dropbox e o segredo estão corretos.",
-    "Please provide a valid Dropbox app key and secret." : "Por favor, forneça uma chave da app e o segredo da Dropbox válidos.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Não foi possível obter as senhas solicitadas. Verifique se o código e o segredo da sua app estão corretos.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Não foi possível obter as senhas de acesso. Verifique se o código e o segredo da sua app estão corretos.",
+    "Please provide a valid app key and secret." : "Por favor, indique um código e segredo de app válidos.",
     "Step 1 failed. Exception: %s" : "Passo 1 falhou. Exceção: %s",
     "Step 2 failed. Exception: %s" : "Passo 2 falhou. Exceção: %s",
     "External storage" : "Armazenamento Externo",
-    "Local" : "Local",
-    "Location" : "Localização:",
+    "Storage with id \"%i\" not found" : "Não foi encontrado o armazenamento com a id. \"%i\"",
+    "Invalid mount point" : "Ponto de montagem inválido",
+    "Invalid storage backend \"%s\"" : "Backend de armazenamento inválido \"%s\"",
+    "Unsatisfied authentication mechanism parameters" : "Parâmetros do mecanismo de autenticação inválidos",
+    "Personal" : "Pessoal",
+    "System" : "Sistema",
+    "Grant access" : "Conceder acesso",
+    "Access granted" : "Acesso autorizado",
+    "Error configuring OAuth1" : "Erro de configuração OAuth1",
+    "Error configuring OAuth2" : "Erro de configuração OAuth2",
+    "Generate keys" : "Gerar chaves",
+    "Error generating key pair" : "Erro ao gerar chave par",
+    "Enable encryption" : "Ative a encriptação",
+    "Enable previews" : "Ative as pré-visualizações",
+    "Check for changes" : "Verifique as suas alterações",
+    "Never" : "Nunca",
+    "Once every direct access" : "Uma vez em cada acesso direto",
+    "Every time the filesystem is used" : "De todas as vezes que o sistema de ficheiros é usado",
+    "All users. Type to select user or group." : "Todos os utilizadores. Digite para selecionar o utilizador ou grupo.",
+    "(group)" : "(grupo)",
+    "Saved" : "Guardado",
+    "Access key" : "Código de acesso",
+    "Secret key" : "Código secreto",
+    "Builtin" : "Integrado",
+    "None" : "Nenhum",
+    "OAuth1" : "OAuth1",
+    "App key" : "Chave da App",
+    "App secret" : "Segredo da app",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "Id. do Cliente",
+    "Client secret" : "Segredo do cliente\\\\",
+    "Username" : "Nome de utilizador",
+    "Password" : "Palavra-passe",
+    "API key" : "Chave API",
+    "Username and password" : "Nome de utilizador e palavra-passe",
+    "Session credentials" : "Credenciais da sessão",
+    "Public key" : "Chave pública",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Chave",
-    "Secret" : "Secreto",
     "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 e compatível",
-    "Access Key" : "Chave de Acesso",
-    "Secret Key" : "Chave Secreta",
     "Hostname" : "Nome do Anfitrião",
     "Port" : "Porta",
     "Region" : "Região",
     "Enable SSL" : "Ativar SSL",
     "Enable Path Style" : "Ativar Estilo do Caminho",
-    "App key" : "Chave da App",
-    "App secret" : "Chave secreta da aplicação",
-    "Host" : "Anfitrião",
-    "Username" : "Nome de utilizador",
-    "Password" : "Palavra-passe",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Remote subfolder" : "Subpasta remota ",
+    "Secure https://" : "https:// Seguro",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Anfitrião",
     "Secure ftps://" : "ftps:// Seguro",
-    "Client ID" : "Id. do Cliente",
-    "Client secret" : "Segredo do cliente",
-    "OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
-    "Region (optional for OpenStack Object Storage)" : "Região (opcional para OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Chave API (necessário para Rackspace Cloud File)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nome do Serviço (necessário para OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Senha (necessária para OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nome do Serviço (necessário para OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Nome do Serviço (necessário para OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Timeout de pedidos HTTP em segundos",
+    "Google Drive" : "Google Drive",
+    "Local" : "Local",
+    "Location" : "Localização:",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Root",
+    "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Compartilhar",
-    "SMB / CIFS using OC login" : "SMB / CIFS utilizando o início de sessão OC",
-    "Username as share" : "Utilizar nome de utilizador como partilha",
-    "URL" : "URL",
-    "Secure https://" : "https:// Seguro",
-    "Public key" : "Chave pública",
-    "Storage with id \"%i\" not found" : "Armazenamento com ID \"%i\" não encontrado",
-    "Invalid mount point" : "Ponto de montagem inválido",
-    "Invalid storage backend \"%s\"" : "Backend de armazenamento inválido \"%s\"",
-    "Access granted" : "Acesso autorizado",
-    "Error configuring Dropbox storage" : "Erro ao configurar o armazenamento do Dropbox",
-    "Grant access" : "Conceder acesso",
-    "Error configuring Google Drive storage" : "Erro ao configurar o armazenamento do Google Drive",
-    "Personal" : "Pessoal",
-    "System" : "Sistema",
-    "All users. Type to select user or group." : "Todos os utilizadores. Digite para selecionar o utilizador ou grupo.",
-    "(group)" : "(grupo)",
-    "Saved" : "Guardado",
-    "Generate keys" : "Gerar chaves",
-    "Error generating key pair" : "Erro ao gerar chave par",
+    "Username as share" : "Nome de utilizador como partilha",
+    "OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
     "<b>Note:</b> " : "<b>Nota:</b> ",
-    "and" : "e",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Aviso:</b> O suporte cURL no PHP não está activo ou instalado. Não é possível montar %s. Peça ao seu administrador para instalar.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Aviso:</b> O suporte FTP no PHP não está activo ou instalado. Não é possível montar %s. Peça ao seu administrador para instalar.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Aviso:</b> O cliente\"%s\" não está instalado. Não é possível montar \"%s\" . Peça ao seu administrador para instalar.",
@@ -70,11 +80,12 @@ OC.L10N.register(
     "Scope" : "Âmbito",
     "External Storage" : "Armazenamento Externo",
     "Folder name" : "Nome da pasta",
+    "Authentication" : "Autenticação",
     "Configuration" : "Configuração",
     "Available for" : "Disponível para ",
-    "Add storage" : "Adicionar armazenamento",
     "Advanced settings" : "Definições avançadas",
     "Delete" : "Apagar",
+    "Add storage" : "Adicionar armazenamento",
     "Enable User External Storage" : "Ativar Armazenamento Externo para o Utilizador",
     "Allow users to mount the following external storage" : "Permitir que os utilizadores montem o seguinte armazenamento externo"
 },
diff --git a/apps/files_external/l10n/pt_PT.json b/apps/files_external/l10n/pt_PT.json
index 72fe8a6ee39..24955db65f6 100644
--- a/apps/files_external/l10n/pt_PT.json
+++ b/apps/files_external/l10n/pt_PT.json
@@ -1,63 +1,73 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "O pedido de obtenção falhou. Verifique se a sua chave da app Dropbox e o segredo estão corretos.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "O pedido de obtenção falhou. Verifique se a sua chave da app Dropbox e o segredo estão corretos.",
-    "Please provide a valid Dropbox app key and secret." : "Por favor, forneça uma chave da app e o segredo da Dropbox válidos.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Não foi possível obter as senhas solicitadas. Verifique se o código e o segredo da sua app estão corretos.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Não foi possível obter as senhas de acesso. Verifique se o código e o segredo da sua app estão corretos.",
+    "Please provide a valid app key and secret." : "Por favor, indique um código e segredo de app válidos.",
     "Step 1 failed. Exception: %s" : "Passo 1 falhou. Exceção: %s",
     "Step 2 failed. Exception: %s" : "Passo 2 falhou. Exceção: %s",
     "External storage" : "Armazenamento Externo",
-    "Local" : "Local",
-    "Location" : "Localização:",
+    "Storage with id \"%i\" not found" : "Não foi encontrado o armazenamento com a id. \"%i\"",
+    "Invalid mount point" : "Ponto de montagem inválido",
+    "Invalid storage backend \"%s\"" : "Backend de armazenamento inválido \"%s\"",
+    "Unsatisfied authentication mechanism parameters" : "Parâmetros do mecanismo de autenticação inválidos",
+    "Personal" : "Pessoal",
+    "System" : "Sistema",
+    "Grant access" : "Conceder acesso",
+    "Access granted" : "Acesso autorizado",
+    "Error configuring OAuth1" : "Erro de configuração OAuth1",
+    "Error configuring OAuth2" : "Erro de configuração OAuth2",
+    "Generate keys" : "Gerar chaves",
+    "Error generating key pair" : "Erro ao gerar chave par",
+    "Enable encryption" : "Ative a encriptação",
+    "Enable previews" : "Ative as pré-visualizações",
+    "Check for changes" : "Verifique as suas alterações",
+    "Never" : "Nunca",
+    "Once every direct access" : "Uma vez em cada acesso direto",
+    "Every time the filesystem is used" : "De todas as vezes que o sistema de ficheiros é usado",
+    "All users. Type to select user or group." : "Todos os utilizadores. Digite para selecionar o utilizador ou grupo.",
+    "(group)" : "(grupo)",
+    "Saved" : "Guardado",
+    "Access key" : "Código de acesso",
+    "Secret key" : "Código secreto",
+    "Builtin" : "Integrado",
+    "None" : "Nenhum",
+    "OAuth1" : "OAuth1",
+    "App key" : "Chave da App",
+    "App secret" : "Segredo da app",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "Id. do Cliente",
+    "Client secret" : "Segredo do cliente\\\\",
+    "Username" : "Nome de utilizador",
+    "Password" : "Palavra-passe",
+    "API key" : "Chave API",
+    "Username and password" : "Nome de utilizador e palavra-passe",
+    "Session credentials" : "Credenciais da sessão",
+    "Public key" : "Chave pública",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Chave",
-    "Secret" : "Secreto",
     "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 e compatível",
-    "Access Key" : "Chave de Acesso",
-    "Secret Key" : "Chave Secreta",
     "Hostname" : "Nome do Anfitrião",
     "Port" : "Porta",
     "Region" : "Região",
     "Enable SSL" : "Ativar SSL",
     "Enable Path Style" : "Ativar Estilo do Caminho",
-    "App key" : "Chave da App",
-    "App secret" : "Chave secreta da aplicação",
-    "Host" : "Anfitrião",
-    "Username" : "Nome de utilizador",
-    "Password" : "Palavra-passe",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Remote subfolder" : "Subpasta remota ",
+    "Secure https://" : "https:// Seguro",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Anfitrião",
     "Secure ftps://" : "ftps:// Seguro",
-    "Client ID" : "Id. do Cliente",
-    "Client secret" : "Segredo do cliente",
-    "OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
-    "Region (optional for OpenStack Object Storage)" : "Região (opcional para OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Chave API (necessário para Rackspace Cloud File)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nome do Serviço (necessário para OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Senha (necessária para OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nome do Serviço (necessário para OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Nome do Serviço (necessário para OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Timeout de pedidos HTTP em segundos",
+    "Google Drive" : "Google Drive",
+    "Local" : "Local",
+    "Location" : "Localização:",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Root",
+    "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Compartilhar",
-    "SMB / CIFS using OC login" : "SMB / CIFS utilizando o início de sessão OC",
-    "Username as share" : "Utilizar nome de utilizador como partilha",
-    "URL" : "URL",
-    "Secure https://" : "https:// Seguro",
-    "Public key" : "Chave pública",
-    "Storage with id \"%i\" not found" : "Armazenamento com ID \"%i\" não encontrado",
-    "Invalid mount point" : "Ponto de montagem inválido",
-    "Invalid storage backend \"%s\"" : "Backend de armazenamento inválido \"%s\"",
-    "Access granted" : "Acesso autorizado",
-    "Error configuring Dropbox storage" : "Erro ao configurar o armazenamento do Dropbox",
-    "Grant access" : "Conceder acesso",
-    "Error configuring Google Drive storage" : "Erro ao configurar o armazenamento do Google Drive",
-    "Personal" : "Pessoal",
-    "System" : "Sistema",
-    "All users. Type to select user or group." : "Todos os utilizadores. Digite para selecionar o utilizador ou grupo.",
-    "(group)" : "(grupo)",
-    "Saved" : "Guardado",
-    "Generate keys" : "Gerar chaves",
-    "Error generating key pair" : "Erro ao gerar chave par",
+    "Username as share" : "Nome de utilizador como partilha",
+    "OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
     "<b>Note:</b> " : "<b>Nota:</b> ",
-    "and" : "e",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Aviso:</b> O suporte cURL no PHP não está activo ou instalado. Não é possível montar %s. Peça ao seu administrador para instalar.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Aviso:</b> O suporte FTP no PHP não está activo ou instalado. Não é possível montar %s. Peça ao seu administrador para instalar.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Aviso:</b> O cliente\"%s\" não está instalado. Não é possível montar \"%s\" . Peça ao seu administrador para instalar.",
@@ -68,11 +78,12 @@
     "Scope" : "Âmbito",
     "External Storage" : "Armazenamento Externo",
     "Folder name" : "Nome da pasta",
+    "Authentication" : "Autenticação",
     "Configuration" : "Configuração",
     "Available for" : "Disponível para ",
-    "Add storage" : "Adicionar armazenamento",
     "Advanced settings" : "Definições avançadas",
     "Delete" : "Apagar",
+    "Add storage" : "Adicionar armazenamento",
     "Enable User External Storage" : "Ativar Armazenamento Externo para o Utilizador",
     "Allow users to mount the following external storage" : "Permitir que os utilizadores montem o seguinte armazenamento externo"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/ro.js b/apps/files_external/l10n/ro.js
index e7e6a5662f5..502d9a5cbef 100644
--- a/apps/files_external/l10n/ro.js
+++ b/apps/files_external/l10n/ro.js
@@ -1,37 +1,35 @@
 OC.L10N.register(
     "files_external",
     {
-    "Please provide a valid Dropbox app key and secret." : "Prezintă te rog o cheie de Dropbox validă și parola",
     "External storage" : "Stocare externă",
-    "Local" : "Local",
-    "Location" : "Locație",
+    "Personal" : "Personal",
+    "Grant access" : "Permite accesul",
+    "Access granted" : "Acces permis",
+    "Saved" : "Salvat",
+    "None" : "Niciuna",
+    "Username" : "Nume utilizator",
+    "Password" : "Parolă",
+    "API key" : "Cheie API",
+    "Public key" : "Cheie publică",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Cheie",
-    "Secret" : "Secret",
-    "Access Key" : "Cheie de acces",
-    "Secret Key" : "Cheie secretă",
     "Hostname" : "Hostname",
     "Port" : "Portul",
     "Region" : "Regiune",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Host" : "Gazdă",
-    "Username" : "Nume utilizator",
-    "Password" : "Parolă",
+    "Local" : "Local",
+    "Location" : "Locație",
+    "ownCloud" : "ownCloud",
+    "Root" : "Root",
     "Share" : "Partajează",
-    "URL" : "URL",
-    "Public key" : "Cheie publică",
-    "Access granted" : "Acces permis",
-    "Error configuring Dropbox storage" : "Eroare la configurarea mediului de stocare Dropbox",
-    "Grant access" : "Permite accesul",
-    "Error configuring Google Drive storage" : "Eroare la configurarea mediului de stocare Google Drive",
-    "Personal" : "Personal",
-    "Saved" : "Salvat",
     "Name" : "Nume",
     "Storage type" : "Tip stocare",
     "External Storage" : "Stocare externă",
     "Folder name" : "Denumire director",
     "Configuration" : "Configurație",
-    "Add storage" : "Adauga stocare",
     "Delete" : "Șterge",
+    "Add storage" : "Adauga stocare",
     "Enable User External Storage" : "Permite stocare externă pentru utilizatori",
     "Allow users to mount the following external storage" : "Permite utilizatorilor să monteze următoarea unitate de stocare"
 },
diff --git a/apps/files_external/l10n/ro.json b/apps/files_external/l10n/ro.json
index bc7612b5cde..41c844e36b7 100644
--- a/apps/files_external/l10n/ro.json
+++ b/apps/files_external/l10n/ro.json
@@ -1,35 +1,33 @@
 { "translations": {
-    "Please provide a valid Dropbox app key and secret." : "Prezintă te rog o cheie de Dropbox validă și parola",
     "External storage" : "Stocare externă",
-    "Local" : "Local",
-    "Location" : "Locație",
+    "Personal" : "Personal",
+    "Grant access" : "Permite accesul",
+    "Access granted" : "Acces permis",
+    "Saved" : "Salvat",
+    "None" : "Niciuna",
+    "Username" : "Nume utilizator",
+    "Password" : "Parolă",
+    "API key" : "Cheie API",
+    "Public key" : "Cheie publică",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Cheie",
-    "Secret" : "Secret",
-    "Access Key" : "Cheie de acces",
-    "Secret Key" : "Cheie secretă",
     "Hostname" : "Hostname",
     "Port" : "Portul",
     "Region" : "Regiune",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Host" : "Gazdă",
-    "Username" : "Nume utilizator",
-    "Password" : "Parolă",
+    "Local" : "Local",
+    "Location" : "Locație",
+    "ownCloud" : "ownCloud",
+    "Root" : "Root",
     "Share" : "Partajează",
-    "URL" : "URL",
-    "Public key" : "Cheie publică",
-    "Access granted" : "Acces permis",
-    "Error configuring Dropbox storage" : "Eroare la configurarea mediului de stocare Dropbox",
-    "Grant access" : "Permite accesul",
-    "Error configuring Google Drive storage" : "Eroare la configurarea mediului de stocare Google Drive",
-    "Personal" : "Personal",
-    "Saved" : "Salvat",
     "Name" : "Nume",
     "Storage type" : "Tip stocare",
     "External Storage" : "Stocare externă",
     "Folder name" : "Denumire director",
     "Configuration" : "Configurație",
-    "Add storage" : "Adauga stocare",
     "Delete" : "Șterge",
+    "Add storage" : "Adauga stocare",
     "Enable User External Storage" : "Permite stocare externă pentru utilizatori",
     "Allow users to mount the following external storage" : "Permite utilizatorilor să monteze următoarea unitate de stocare"
 },"pluralForm" :"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"
diff --git a/apps/files_external/l10n/ru.js b/apps/files_external/l10n/ru.js
index d395470a794..f76c5526bca 100644
--- a/apps/files_external/l10n/ru.js
+++ b/apps/files_external/l10n/ru.js
@@ -1,59 +1,18 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Не удалось получить токен запроса. Проверьте правильность вашего ключа и секрета Dropbox.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Не удалось получить токен доступа. Проверьте правильность вашего ключа и секрета Dropbox.",
-    "Please provide a valid Dropbox app key and secret." : "Укажите действительные ключ и секрет для Dropbox.",
     "Step 1 failed. Exception: %s" : "Шаг 1 неудачен. Исключение: %s",
     "Step 2 failed. Exception: %s" : "Шаг 2 неудачен. Исключение: %s",
     "External storage" : "Внешнее хранилище",
-    "Local" : "Локально",
-    "Location" : "Местоположение",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Ключ",
-    "Secret" : "Секрет",
-    "Bucket" : "Корзина",
-    "Amazon S3 and compliant" : "Amazon S3 и совместимый",
-    "Access Key" : "Ключ доступа",
-    "Secret Key" : "Секретный ключ",
-    "Hostname" : "Имя хоста",
-    "Port" : "Порт",
-    "Region" : "Область",
-    "Enable SSL" : "Включить SSL",
-    "Enable Path Style" : "Включить стиль пути",
-    "App key" : "Ключ приложения",
-    "App secret" : "Секретный ключ ",
-    "Host" : "Сервер",
-    "Username" : "Имя пользователя",
-    "Password" : "Пароль",
-    "Remote subfolder" : "Удаленный подкаталог",
-    "Secure ftps://" : "Защищённый ftps://",
-    "Client ID" : "Идентификатор клиента",
-    "Client secret" : "Клиентский ключ ",
-    "OpenStack Object Storage" : "Хранилище объектов OpenStack",
-    "Region (optional for OpenStack Object Storage)" : "Регион (необяз. для Хранилища объектов OpenStack)",
-    "API Key (required for Rackspace Cloud Files)" : "Ключ API (обяз. для Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Имя арендатора (обяз. для Хранилища объектов OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Пароль (обяз. для Хранилища объектов OpenStack)",
-    "Service Name (required for OpenStack Object Storage)" : "Имя Службы (обяз. для Хранилища объектов OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL для удостоверения конечной точки (обяз. для Хранилища объектов OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Тайм-аут HTTP-запросов в секундах",
-    "Share" : "Общий доступ",
-    "SMB / CIFS using OC login" : "SMB / CIFS с ипользованием логина OC",
-    "Username as share" : "Имя пользователя в качестве имени общего ресурса",
-    "URL" : "Ссылка",
-    "Secure https://" : "Безопасный https://",
-    "SFTP with secret key login" : "SFTP с помощью секретного ключа",
-    "Public key" : "Открытый ключ",
     "Storage with id \"%i\" not found" : "Хранилище с идентификатором \"%i\" не найдено",
     "Invalid mount point" : "Неправильная точка входа",
     "Invalid storage backend \"%s\"" : "Неверный бэкенд хранилища \"%s\"",
-    "Access granted" : "Доступ предоставлен",
-    "Error configuring Dropbox storage" : "Ошибка при настройке хранилища Dropbox",
-    "Grant access" : "Предоставить доступ",
-    "Error configuring Google Drive storage" : "Ошибка при настройке хранилища Google Drive",
     "Personal" : "Личное",
     "System" : "Система",
+    "Grant access" : "Предоставить доступ",
+    "Access granted" : "Доступ предоставлен",
+    "Generate keys" : "Создать ключи",
+    "Error generating key pair" : "Ошибка создания ключевой пары",
     "Enable encryption" : "Включить шифрование",
     "Enable previews" : "Включить предпросмотр",
     "Check for changes" : "Проверять изменения",
@@ -63,10 +22,37 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Все пользователи. Введите имя пользователя или группы.",
     "(group)" : "(группа)",
     "Saved" : "Сохранено",
-    "Generate keys" : "Создать ключи",
-    "Error generating key pair" : "Ошибка создания ключевой пары",
+    "None" : "Отсутствует",
+    "App key" : "Ключ приложения",
+    "App secret" : "Секретный ключ ",
+    "Client ID" : "Идентификатор клиента",
+    "Client secret" : "Клиентский ключ ",
+    "Username" : "Имя пользователя",
+    "Password" : "Пароль",
+    "API key" : "Ключ API",
+    "Public key" : "Открытый ключ",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Корзина",
+    "Hostname" : "Имя хоста",
+    "Port" : "Порт",
+    "Region" : "Область",
+    "Enable SSL" : "Включить SSL",
+    "Enable Path Style" : "Включить стиль пути",
+    "WebDAV" : "WebDAV",
+    "URL" : "Ссылка",
+    "Remote subfolder" : "Удаленный подкаталог",
+    "Secure https://" : "Безопасный https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Сервер",
+    "Secure ftps://" : "Защищённый ftps://",
+    "Local" : "Локально",
+    "Location" : "Местоположение",
+    "ownCloud" : "ownCloud",
+    "Root" : "Корневой каталог",
+    "Share" : "Общий доступ",
+    "Username as share" : "Имя пользователя в качестве имени общего ресурса",
+    "OpenStack Object Storage" : "Хранилище объектов OpenStack",
     "<b>Note:</b> " : "<b>Примечание:</b> ",
-    "and" : "и",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примечание:</b> Поддержка cURL в PHP не включена или не установлена. Монтирование %s невозможно. Обратитесь к вашему системному администратору.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примечание:</b> Поддержка FTP в PHP не включена или не установлена. Монтирование %s невозможно. Пожалуйста, обратитесь к системному администратору.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примечание:</b> \"%s\" не установлен. Монтирование %s невозможно. Пожалуйста, обратитесь к системному администратору.",
@@ -79,9 +65,9 @@ OC.L10N.register(
     "Folder name" : "Имя каталога",
     "Configuration" : "Конфигурация",
     "Available for" : "Доступно для",
-    "Add storage" : "Добавить хранилище",
     "Advanced settings" : "Расширенные настройки",
     "Delete" : "Удалить",
+    "Add storage" : "Добавить хранилище",
     "Enable User External Storage" : "Включить пользовательские внешние хранилища",
     "Allow users to mount the following external storage" : "Разрешить пользователям монтировать следующие сервисы хранения данных"
 },
diff --git a/apps/files_external/l10n/ru.json b/apps/files_external/l10n/ru.json
index daeda1d8363..3428d05ef4b 100644
--- a/apps/files_external/l10n/ru.json
+++ b/apps/files_external/l10n/ru.json
@@ -1,57 +1,16 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Не удалось получить токен запроса. Проверьте правильность вашего ключа и секрета Dropbox.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Не удалось получить токен доступа. Проверьте правильность вашего ключа и секрета Dropbox.",
-    "Please provide a valid Dropbox app key and secret." : "Укажите действительные ключ и секрет для Dropbox.",
     "Step 1 failed. Exception: %s" : "Шаг 1 неудачен. Исключение: %s",
     "Step 2 failed. Exception: %s" : "Шаг 2 неудачен. Исключение: %s",
     "External storage" : "Внешнее хранилище",
-    "Local" : "Локально",
-    "Location" : "Местоположение",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Ключ",
-    "Secret" : "Секрет",
-    "Bucket" : "Корзина",
-    "Amazon S3 and compliant" : "Amazon S3 и совместимый",
-    "Access Key" : "Ключ доступа",
-    "Secret Key" : "Секретный ключ",
-    "Hostname" : "Имя хоста",
-    "Port" : "Порт",
-    "Region" : "Область",
-    "Enable SSL" : "Включить SSL",
-    "Enable Path Style" : "Включить стиль пути",
-    "App key" : "Ключ приложения",
-    "App secret" : "Секретный ключ ",
-    "Host" : "Сервер",
-    "Username" : "Имя пользователя",
-    "Password" : "Пароль",
-    "Remote subfolder" : "Удаленный подкаталог",
-    "Secure ftps://" : "Защищённый ftps://",
-    "Client ID" : "Идентификатор клиента",
-    "Client secret" : "Клиентский ключ ",
-    "OpenStack Object Storage" : "Хранилище объектов OpenStack",
-    "Region (optional for OpenStack Object Storage)" : "Регион (необяз. для Хранилища объектов OpenStack)",
-    "API Key (required for Rackspace Cloud Files)" : "Ключ API (обяз. для Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Имя арендатора (обяз. для Хранилища объектов OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Пароль (обяз. для Хранилища объектов OpenStack)",
-    "Service Name (required for OpenStack Object Storage)" : "Имя Службы (обяз. для Хранилища объектов OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL для удостоверения конечной точки (обяз. для Хранилища объектов OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Тайм-аут HTTP-запросов в секундах",
-    "Share" : "Общий доступ",
-    "SMB / CIFS using OC login" : "SMB / CIFS с ипользованием логина OC",
-    "Username as share" : "Имя пользователя в качестве имени общего ресурса",
-    "URL" : "Ссылка",
-    "Secure https://" : "Безопасный https://",
-    "SFTP with secret key login" : "SFTP с помощью секретного ключа",
-    "Public key" : "Открытый ключ",
     "Storage with id \"%i\" not found" : "Хранилище с идентификатором \"%i\" не найдено",
     "Invalid mount point" : "Неправильная точка входа",
     "Invalid storage backend \"%s\"" : "Неверный бэкенд хранилища \"%s\"",
-    "Access granted" : "Доступ предоставлен",
-    "Error configuring Dropbox storage" : "Ошибка при настройке хранилища Dropbox",
-    "Grant access" : "Предоставить доступ",
-    "Error configuring Google Drive storage" : "Ошибка при настройке хранилища Google Drive",
     "Personal" : "Личное",
     "System" : "Система",
+    "Grant access" : "Предоставить доступ",
+    "Access granted" : "Доступ предоставлен",
+    "Generate keys" : "Создать ключи",
+    "Error generating key pair" : "Ошибка создания ключевой пары",
     "Enable encryption" : "Включить шифрование",
     "Enable previews" : "Включить предпросмотр",
     "Check for changes" : "Проверять изменения",
@@ -61,10 +20,37 @@
     "All users. Type to select user or group." : "Все пользователи. Введите имя пользователя или группы.",
     "(group)" : "(группа)",
     "Saved" : "Сохранено",
-    "Generate keys" : "Создать ключи",
-    "Error generating key pair" : "Ошибка создания ключевой пары",
+    "None" : "Отсутствует",
+    "App key" : "Ключ приложения",
+    "App secret" : "Секретный ключ ",
+    "Client ID" : "Идентификатор клиента",
+    "Client secret" : "Клиентский ключ ",
+    "Username" : "Имя пользователя",
+    "Password" : "Пароль",
+    "API key" : "Ключ API",
+    "Public key" : "Открытый ключ",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Корзина",
+    "Hostname" : "Имя хоста",
+    "Port" : "Порт",
+    "Region" : "Область",
+    "Enable SSL" : "Включить SSL",
+    "Enable Path Style" : "Включить стиль пути",
+    "WebDAV" : "WebDAV",
+    "URL" : "Ссылка",
+    "Remote subfolder" : "Удаленный подкаталог",
+    "Secure https://" : "Безопасный https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Сервер",
+    "Secure ftps://" : "Защищённый ftps://",
+    "Local" : "Локально",
+    "Location" : "Местоположение",
+    "ownCloud" : "ownCloud",
+    "Root" : "Корневой каталог",
+    "Share" : "Общий доступ",
+    "Username as share" : "Имя пользователя в качестве имени общего ресурса",
+    "OpenStack Object Storage" : "Хранилище объектов OpenStack",
     "<b>Note:</b> " : "<b>Примечание:</b> ",
-    "and" : "и",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примечание:</b> Поддержка cURL в PHP не включена или не установлена. Монтирование %s невозможно. Обратитесь к вашему системному администратору.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примечание:</b> Поддержка FTP в PHP не включена или не установлена. Монтирование %s невозможно. Пожалуйста, обратитесь к системному администратору.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примечание:</b> \"%s\" не установлен. Монтирование %s невозможно. Пожалуйста, обратитесь к системному администратору.",
@@ -77,9 +63,9 @@
     "Folder name" : "Имя каталога",
     "Configuration" : "Конфигурация",
     "Available for" : "Доступно для",
-    "Add storage" : "Добавить хранилище",
     "Advanced settings" : "Расширенные настройки",
     "Delete" : "Удалить",
+    "Add storage" : "Добавить хранилище",
     "Enable User External Storage" : "Включить пользовательские внешние хранилища",
     "Allow users to mount the following external storage" : "Разрешить пользователям монтировать следующие сервисы хранения данных"
 },"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"
diff --git a/apps/files_external/l10n/si_LK.js b/apps/files_external/l10n/si_LK.js
index 61ce19641bd..80a6026ad75 100644
--- a/apps/files_external/l10n/si_LK.js
+++ b/apps/files_external/l10n/si_LK.js
@@ -1,20 +1,19 @@
 OC.L10N.register(
     "files_external",
     {
-    "Please provide a valid Dropbox app key and secret." : "කරුණාකර වලංගු Dropbox යෙදුම් යතුරක් හා රහසක් ලබාදෙන්න.",
-    "Location" : "ස්ථානය",
+    "Personal" : "පෞද්ගලික",
+    "Grant access" : "පිවිසුම ලබාදෙන්න",
+    "Access granted" : "පිවිසීමට හැක",
+    "None" : "කිසිවක් නැත",
+    "Username" : "පරිශීලක නම",
+    "Password" : "මුර පදය",
     "Port" : "තොට",
     "Region" : "කළාපය",
+    "URL" : "URL",
     "Host" : "සත්කාරකය",
-    "Username" : "පරිශීලක නම",
-    "Password" : "මුර පදය",
+    "Location" : "ස්ථානය",
+    "ownCloud" : "ownCloud",
     "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" : "ෆොල්ඩරයේ නම",
diff --git a/apps/files_external/l10n/si_LK.json b/apps/files_external/l10n/si_LK.json
index d9554fdb970..bc3a9ee11db 100644
--- a/apps/files_external/l10n/si_LK.json
+++ b/apps/files_external/l10n/si_LK.json
@@ -1,18 +1,17 @@
 { "translations": {
-    "Please provide a valid Dropbox app key and secret." : "කරුණාකර වලංගු Dropbox යෙදුම් යතුරක් හා රහසක් ලබාදෙන්න.",
-    "Location" : "ස්ථානය",
+    "Personal" : "පෞද්ගලික",
+    "Grant access" : "පිවිසුම ලබාදෙන්න",
+    "Access granted" : "පිවිසීමට හැක",
+    "None" : "කිසිවක් නැත",
+    "Username" : "පරිශීලක නම",
+    "Password" : "මුර පදය",
     "Port" : "තොට",
     "Region" : "කළාපය",
+    "URL" : "URL",
     "Host" : "සත්කාරකය",
-    "Username" : "පරිශීලක නම",
-    "Password" : "මුර පදය",
+    "Location" : "ස්ථානය",
+    "ownCloud" : "ownCloud",
     "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" : "ෆොල්ඩරයේ නම",
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_SK.js b/apps/files_external/l10n/sk_SK.js
index dc9b1ee84ef..87ea8c64bc5 100644
--- a/apps/files_external/l10n/sk_SK.js
+++ b/apps/files_external/l10n/sk_SK.js
@@ -1,66 +1,53 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Získanie tokenov požiadavky zlyhalo. Overte správnosť svojho kľúča a hesla aplikácie Dropbox.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Získanie prístupových tokenov zlyhalo. Overte správnosť svojho kľúča a hesla aplikácie Dropbox.",
-    "Please provide a valid Dropbox app key and secret." : "Zadajte platný kľúč aplikácie a heslo Dropbox",
     "Step 1 failed. Exception: %s" : "Krok 1 zlyhal. Výnimka: %s",
     "Step 2 failed. Exception: %s" : "Krok 2 zlyhal. Výnimka: %s",
     "External storage" : "Externé úložisko",
-    "Local" : "Lokálny",
-    "Location" : "Umiestnenie",
+    "Invalid mount point" : "Chybný prípojný bod",
+    "Personal" : "Osobné",
+    "System" : "Systém",
+    "Grant access" : "Povoliť prístup",
+    "Access granted" : "Prístup povolený",
+    "Generate keys" : "Vytvoriť kľúče",
+    "Error generating key pair" : "Chyba pri vytváraní dvojice kľúčov",
+    "Enable encryption" : "Povoliť šifrovanie",
+    "Enable previews" : "Povoliť náhľady",
+    "Never" : "Nikdy",
+    "All users. Type to select user or group." : "Všetci používatelia. Začnite písať pre výber používateľa alebo skupinu.",
+    "(group)" : "(skupina)",
+    "Saved" : "Uložené",
+    "None" : "Žiadny",
+    "App key" : "Kľúč aplikácie",
+    "App secret" : "Heslo aplikácie",
+    "Client ID" : "Client ID",
+    "Client secret" : "Heslo klienta",
+    "Username" : "Používateľské meno",
+    "Password" : "Heslo",
+    "API key" : "API kľúč",
+    "Public key" : "Verejný kľúč",
     "Amazon S3" : "Amazon S3",
-    "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",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Remote subfolder" : "Vzdialený podpriečinok",
+    "Secure https://" : "Zabezpečené https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Hostiteľ",
     "Secure ftps://" : "Zabezpečené ftps://",
-    "Client ID" : "Client ID",
-    "Client secret" : "Heslo klienta",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Región (voliteľné pre OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (požadované pre Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Meno nájomcu (požadované pre OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Heslo (požadované pre OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Meno služby (požadované pre OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL of identity endpoint (požadované pre OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Časový limit HTTP požadaviek v sekundách",
+    "Local" : "Lokálny",
+    "Location" : "Umiestnenie",
+    "ownCloud" : "ownCloud",
+    "Root" : "Root",
     "Share" : "Zdieľať",
-    "SMB / CIFS using OC login" : "SMB / CIFS s použitím OC prihlásenia",
     "Username as share" : "Používateľské meno ako zdieľaný priečinok",
-    "URL" : "URL",
-    "Secure https://" : "Zabezpečené https://",
-    "Public key" : "Verejný kľúč",
-    "Invalid mount point" : "Chybný prípojný bod",
-    "Access granted" : "Prístup povolený",
-    "Error configuring Dropbox storage" : "Chyba pri konfigurácii úložiska Dropbox",
-    "Grant access" : "Povoliť prístup",
-    "Error configuring Google Drive storage" : "Chyba pri konfigurácii úložiska Google drive",
-    "Personal" : "Osobné",
-    "System" : "Systém",
-    "Enable encryption" : "Povoliť šifrovanie",
-    "Enable previews" : "Povoliť náhľady",
-    "Never" : "Nikdy",
-    "All users. Type to select user or group." : "Všetci používatelia. Začnite písať pre výber používateľa alebo skupinu.",
-    "(group)" : "(skupina)",
-    "Saved" : "Uložené",
-    "Generate keys" : "Vytvoriť kľúče",
-    "Error generating key pair" : "Chyba pri vytváraní dvojice kľúčov",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Poznámka:</b> ",
-    "and" : "a",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> cURL podpora v PHP nie je zapnutá alebo nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> FTP podpora v PHP nie je zapnutá alebo nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> \"%s\" nie je nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
@@ -72,9 +59,9 @@ OC.L10N.register(
     "Folder name" : "Názov priečinka",
     "Configuration" : "Nastavenia",
     "Available for" : "K dispozícii pre",
-    "Add storage" : "Pridať úložisko",
     "Advanced settings" : "Rozšírené nastavenia",
     "Delete" : "Zmazať",
+    "Add storage" : "Pridať úložisko",
     "Enable User External Storage" : "Povoliť externé úložisko",
     "Allow users to mount the following external storage" : "Povoliť používateľom pripojiť tieto externé úložiská"
 },
diff --git a/apps/files_external/l10n/sk_SK.json b/apps/files_external/l10n/sk_SK.json
index fbc4c821210..5e7f4d1fa94 100644
--- a/apps/files_external/l10n/sk_SK.json
+++ b/apps/files_external/l10n/sk_SK.json
@@ -1,64 +1,51 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Získanie tokenov požiadavky zlyhalo. Overte správnosť svojho kľúča a hesla aplikácie Dropbox.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Získanie prístupových tokenov zlyhalo. Overte správnosť svojho kľúča a hesla aplikácie Dropbox.",
-    "Please provide a valid Dropbox app key and secret." : "Zadajte platný kľúč aplikácie a heslo Dropbox",
     "Step 1 failed. Exception: %s" : "Krok 1 zlyhal. Výnimka: %s",
     "Step 2 failed. Exception: %s" : "Krok 2 zlyhal. Výnimka: %s",
     "External storage" : "Externé úložisko",
-    "Local" : "Lokálny",
-    "Location" : "Umiestnenie",
+    "Invalid mount point" : "Chybný prípojný bod",
+    "Personal" : "Osobné",
+    "System" : "Systém",
+    "Grant access" : "Povoliť prístup",
+    "Access granted" : "Prístup povolený",
+    "Generate keys" : "Vytvoriť kľúče",
+    "Error generating key pair" : "Chyba pri vytváraní dvojice kľúčov",
+    "Enable encryption" : "Povoliť šifrovanie",
+    "Enable previews" : "Povoliť náhľady",
+    "Never" : "Nikdy",
+    "All users. Type to select user or group." : "Všetci používatelia. Začnite písať pre výber používateľa alebo skupinu.",
+    "(group)" : "(skupina)",
+    "Saved" : "Uložené",
+    "None" : "Žiadny",
+    "App key" : "Kľúč aplikácie",
+    "App secret" : "Heslo aplikácie",
+    "Client ID" : "Client ID",
+    "Client secret" : "Heslo klienta",
+    "Username" : "Používateľské meno",
+    "Password" : "Heslo",
+    "API key" : "API kľúč",
+    "Public key" : "Verejný kľúč",
     "Amazon S3" : "Amazon S3",
-    "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",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Remote subfolder" : "Vzdialený podpriečinok",
+    "Secure https://" : "Zabezpečené https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Hostiteľ",
     "Secure ftps://" : "Zabezpečené ftps://",
-    "Client ID" : "Client ID",
-    "Client secret" : "Heslo klienta",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Región (voliteľné pre OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (požadované pre Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Meno nájomcu (požadované pre OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Heslo (požadované pre OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Meno služby (požadované pre OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL of identity endpoint (požadované pre OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Časový limit HTTP požadaviek v sekundách",
+    "Local" : "Lokálny",
+    "Location" : "Umiestnenie",
+    "ownCloud" : "ownCloud",
+    "Root" : "Root",
     "Share" : "Zdieľať",
-    "SMB / CIFS using OC login" : "SMB / CIFS s použitím OC prihlásenia",
     "Username as share" : "Používateľské meno ako zdieľaný priečinok",
-    "URL" : "URL",
-    "Secure https://" : "Zabezpečené https://",
-    "Public key" : "Verejný kľúč",
-    "Invalid mount point" : "Chybný prípojný bod",
-    "Access granted" : "Prístup povolený",
-    "Error configuring Dropbox storage" : "Chyba pri konfigurácii úložiska Dropbox",
-    "Grant access" : "Povoliť prístup",
-    "Error configuring Google Drive storage" : "Chyba pri konfigurácii úložiska Google drive",
-    "Personal" : "Osobné",
-    "System" : "Systém",
-    "Enable encryption" : "Povoliť šifrovanie",
-    "Enable previews" : "Povoliť náhľady",
-    "Never" : "Nikdy",
-    "All users. Type to select user or group." : "Všetci používatelia. Začnite písať pre výber používateľa alebo skupinu.",
-    "(group)" : "(skupina)",
-    "Saved" : "Uložené",
-    "Generate keys" : "Vytvoriť kľúče",
-    "Error generating key pair" : "Chyba pri vytváraní dvojice kľúčov",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Poznámka:</b> ",
-    "and" : "a",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> cURL podpora v PHP nie je zapnutá alebo nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> FTP podpora v PHP nie je zapnutá alebo nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> \"%s\" nie je nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
@@ -70,9 +57,9 @@
     "Folder name" : "Názov priečinka",
     "Configuration" : "Nastavenia",
     "Available for" : "K dispozícii pre",
-    "Add storage" : "Pridať úložisko",
     "Advanced settings" : "Rozšírené nastavenia",
     "Delete" : "Zmazať",
+    "Add storage" : "Pridať úložisko",
     "Enable User External Storage" : "Povoliť externé úložisko",
     "Allow users to mount the following external storage" : "Povoliť používateľom pripojiť tieto externé úložiská"
 },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
diff --git a/apps/files_external/l10n/sl.js b/apps/files_external/l10n/sl.js
index 094414ed296..b4c9cc00275 100644
--- a/apps/files_external/l10n/sl.js
+++ b/apps/files_external/l10n/sl.js
@@ -1,59 +1,18 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Pridobivanje žetonov za zahteve je spodletelo. Preverite, da sta ključ in skrivno geslo programa Dropbox navedena pravilno.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Pridobivanje žetonov za dostop je spodletelo. Preverite, da sta ključ in skrivno geslo programa Dropbox navedena pravilno.",
-    "Please provide a valid Dropbox app key and secret." : "Vpisati je treba veljaven ključ programa in kodo za Dropbox",
     "Step 1 failed. Exception: %s" : "1. korak je spodletel. Izjemna napaka: %s",
     "Step 2 failed. Exception: %s" : "2. korak je spodletel. Izjemna napaka: %s",
     "External storage" : "Zunanja shramba",
-    "Local" : "Krajevno",
-    "Location" : "Mesto",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Ključ",
-    "Secret" : "Skrivni ključ",
-    "Bucket" : "Pomnilniško vedro",
-    "Amazon S3 and compliant" : "Amazon S3 in podobno",
-    "Access Key" : "Ključ za dostop",
-    "Secret Key" : "Skrivni ključ",
-    "Hostname" : "Ime gostitelja",
-    "Port" : "Vrata",
-    "Region" : "Območje",
-    "Enable SSL" : "Omogoči SSL",
-    "Enable Path Style" : "Omogoči slog poti",
-    "App key" : "Programski ključ",
-    "App secret" : "Skrivni programski ključ",
-    "Host" : "Gostitelj",
-    "Username" : "Uporabniško ime",
-    "Password" : "Geslo",
-    "Remote subfolder" : "Oddaljena podrejena mapa",
-    "Secure ftps://" : "Varni način ftps://",
-    "Client ID" : "ID odjemalca",
-    "Client secret" : "Skrivni ključ odjemalca",
-    "OpenStack Object Storage" : "Shramba predmeta OpenStack",
-    "Region (optional for OpenStack Object Storage)" : "Območje (zahtevano za shrambo predmeta OpenStack)",
-    "API Key (required for Rackspace Cloud Files)" : "Ključ programskega vmesnika (API) (zahtevan je za datoteke v oblaku Rackspace)",
-    "Tenantname (required for OpenStack Object Storage)" : "Ime uporabnika (zahtevano za shrambo predmeta OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Geslo (zahtevano za shrambo predmeta OpenStack)",
-    "Service Name (required for OpenStack Object Storage)" : "Ime storitve (zahtevano za shrambo predmeta OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Naslov URL končne točke  uporabnika (zahtevano za shrambo predmeta OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Časovni zamik zahtev HTTP v sekundah",
-    "Share" : "Souporaba",
-    "SMB / CIFS using OC login" : "SMB / CIFS z uporabo prijave OC",
-    "Username as share" : "Uporabniško ime za souporabo",
-    "URL" : "Naslov URL",
-    "Secure https://" : "Varni način https://",
-    "SFTP with secret key login" : "Prijava preko protokola SFTP z geslom",
-    "Public key" : "Javni ključ",
     "Storage with id \"%i\" not found" : "Shrambe z ID \"%i\" ni mogoče najti.",
     "Invalid mount point" : "Neveljavna priklopna točka",
     "Invalid storage backend \"%s\"" : "Neveljaven ozadnji program shrambe \"%s\"",
-    "Access granted" : "Dostop je odobren",
-    "Error configuring Dropbox storage" : "Napaka nastavljanja shrambe Dropbox",
-    "Grant access" : "Odobri dostop",
-    "Error configuring Google Drive storage" : "Napaka nastavljanja shrambe Google Drive",
     "Personal" : "Osebno",
     "System" : "Sistem",
+    "Grant access" : "Odobri dostop",
+    "Access granted" : "Dostop je odobren",
+    "Generate keys" : "Ustvari ključe",
+    "Error generating key pair" : "Prišlo je do napake med ustvarjanjem para ključev",
     "Enable encryption" : "Omogoči šifriranje",
     "Enable previews" : "Omogoči predogled",
     "Check for changes" : "Preveri za spremembe",
@@ -63,10 +22,37 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Vsi uporabniki. Skupino ali uporabnika je mogoče tudi izbrati.",
     "(group)" : "(skupina)",
     "Saved" : "Shranjeno",
-    "Generate keys" : "Ustvari ključe",
-    "Error generating key pair" : "Prišlo je do napake med ustvarjanjem para ključev",
+    "None" : "Brez",
+    "App key" : "Programski ključ",
+    "App secret" : "Skrivni programski ključ",
+    "Client ID" : "ID odjemalca",
+    "Client secret" : "Skrivni ključ odjemalca",
+    "Username" : "Uporabniško ime",
+    "Password" : "Geslo",
+    "API key" : "Ključ API",
+    "Public key" : "Javni ključ",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Pomnilniško vedro",
+    "Hostname" : "Ime gostitelja",
+    "Port" : "Vrata",
+    "Region" : "Območje",
+    "Enable SSL" : "Omogoči SSL",
+    "Enable Path Style" : "Omogoči slog poti",
+    "WebDAV" : "WebDAV",
+    "URL" : "Naslov URL",
+    "Remote subfolder" : "Oddaljena podrejena mapa",
+    "Secure https://" : "Varni način https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Gostitelj",
+    "Secure ftps://" : "Varni način ftps://",
+    "Local" : "Krajevno",
+    "Location" : "Mesto",
+    "ownCloud" : "ownCloud",
+    "Root" : "Koren",
+    "Share" : "Souporaba",
+    "Username as share" : "Uporabniško ime za souporabo",
+    "OpenStack Object Storage" : "Shramba predmeta OpenStack",
     "<b>Note:</b> " : "<b>Opomba:</b> ",
-    "and" : "in",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Opomba:</b> Podpora za naslove cURL v PHP ni omogočena, ali pa ni ustrezno nameščenih programov. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Opomba:</b> Podpora za protokol FTP v PHP ni omogočena, ali pa ni ustrezno nameščenih programov. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Opomba:</b> Program \"%s\" ni nameščen. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika.",
@@ -79,9 +65,9 @@ OC.L10N.register(
     "Folder name" : "Ime mape",
     "Configuration" : "Nastavitve",
     "Available for" : "Na voljo za",
-    "Add storage" : "Dodaj shrambo",
     "Advanced settings" : "Napredne nastavitve",
     "Delete" : "Izbriši",
+    "Add storage" : "Dodaj shrambo",
     "Enable User External Storage" : "Omogoči zunanjo uporabniško podatkovno shrambo",
     "Allow users to mount the following external storage" : "Dovoli uporabnikom priklapljanje navedenih zunanjih shramb."
 },
diff --git a/apps/files_external/l10n/sl.json b/apps/files_external/l10n/sl.json
index 4cebc8a1ac4..56b64fb17cc 100644
--- a/apps/files_external/l10n/sl.json
+++ b/apps/files_external/l10n/sl.json
@@ -1,57 +1,16 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Pridobivanje žetonov za zahteve je spodletelo. Preverite, da sta ključ in skrivno geslo programa Dropbox navedena pravilno.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Pridobivanje žetonov za dostop je spodletelo. Preverite, da sta ključ in skrivno geslo programa Dropbox navedena pravilno.",
-    "Please provide a valid Dropbox app key and secret." : "Vpisati je treba veljaven ključ programa in kodo za Dropbox",
     "Step 1 failed. Exception: %s" : "1. korak je spodletel. Izjemna napaka: %s",
     "Step 2 failed. Exception: %s" : "2. korak je spodletel. Izjemna napaka: %s",
     "External storage" : "Zunanja shramba",
-    "Local" : "Krajevno",
-    "Location" : "Mesto",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Ključ",
-    "Secret" : "Skrivni ključ",
-    "Bucket" : "Pomnilniško vedro",
-    "Amazon S3 and compliant" : "Amazon S3 in podobno",
-    "Access Key" : "Ključ za dostop",
-    "Secret Key" : "Skrivni ključ",
-    "Hostname" : "Ime gostitelja",
-    "Port" : "Vrata",
-    "Region" : "Območje",
-    "Enable SSL" : "Omogoči SSL",
-    "Enable Path Style" : "Omogoči slog poti",
-    "App key" : "Programski ključ",
-    "App secret" : "Skrivni programski ključ",
-    "Host" : "Gostitelj",
-    "Username" : "Uporabniško ime",
-    "Password" : "Geslo",
-    "Remote subfolder" : "Oddaljena podrejena mapa",
-    "Secure ftps://" : "Varni način ftps://",
-    "Client ID" : "ID odjemalca",
-    "Client secret" : "Skrivni ključ odjemalca",
-    "OpenStack Object Storage" : "Shramba predmeta OpenStack",
-    "Region (optional for OpenStack Object Storage)" : "Območje (zahtevano za shrambo predmeta OpenStack)",
-    "API Key (required for Rackspace Cloud Files)" : "Ključ programskega vmesnika (API) (zahtevan je za datoteke v oblaku Rackspace)",
-    "Tenantname (required for OpenStack Object Storage)" : "Ime uporabnika (zahtevano za shrambo predmeta OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Geslo (zahtevano za shrambo predmeta OpenStack)",
-    "Service Name (required for OpenStack Object Storage)" : "Ime storitve (zahtevano za shrambo predmeta OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Naslov URL končne točke  uporabnika (zahtevano za shrambo predmeta OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Časovni zamik zahtev HTTP v sekundah",
-    "Share" : "Souporaba",
-    "SMB / CIFS using OC login" : "SMB / CIFS z uporabo prijave OC",
-    "Username as share" : "Uporabniško ime za souporabo",
-    "URL" : "Naslov URL",
-    "Secure https://" : "Varni način https://",
-    "SFTP with secret key login" : "Prijava preko protokola SFTP z geslom",
-    "Public key" : "Javni ključ",
     "Storage with id \"%i\" not found" : "Shrambe z ID \"%i\" ni mogoče najti.",
     "Invalid mount point" : "Neveljavna priklopna točka",
     "Invalid storage backend \"%s\"" : "Neveljaven ozadnji program shrambe \"%s\"",
-    "Access granted" : "Dostop je odobren",
-    "Error configuring Dropbox storage" : "Napaka nastavljanja shrambe Dropbox",
-    "Grant access" : "Odobri dostop",
-    "Error configuring Google Drive storage" : "Napaka nastavljanja shrambe Google Drive",
     "Personal" : "Osebno",
     "System" : "Sistem",
+    "Grant access" : "Odobri dostop",
+    "Access granted" : "Dostop je odobren",
+    "Generate keys" : "Ustvari ključe",
+    "Error generating key pair" : "Prišlo je do napake med ustvarjanjem para ključev",
     "Enable encryption" : "Omogoči šifriranje",
     "Enable previews" : "Omogoči predogled",
     "Check for changes" : "Preveri za spremembe",
@@ -61,10 +20,37 @@
     "All users. Type to select user or group." : "Vsi uporabniki. Skupino ali uporabnika je mogoče tudi izbrati.",
     "(group)" : "(skupina)",
     "Saved" : "Shranjeno",
-    "Generate keys" : "Ustvari ključe",
-    "Error generating key pair" : "Prišlo je do napake med ustvarjanjem para ključev",
+    "None" : "Brez",
+    "App key" : "Programski ključ",
+    "App secret" : "Skrivni programski ključ",
+    "Client ID" : "ID odjemalca",
+    "Client secret" : "Skrivni ključ odjemalca",
+    "Username" : "Uporabniško ime",
+    "Password" : "Geslo",
+    "API key" : "Ključ API",
+    "Public key" : "Javni ključ",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Pomnilniško vedro",
+    "Hostname" : "Ime gostitelja",
+    "Port" : "Vrata",
+    "Region" : "Območje",
+    "Enable SSL" : "Omogoči SSL",
+    "Enable Path Style" : "Omogoči slog poti",
+    "WebDAV" : "WebDAV",
+    "URL" : "Naslov URL",
+    "Remote subfolder" : "Oddaljena podrejena mapa",
+    "Secure https://" : "Varni način https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Gostitelj",
+    "Secure ftps://" : "Varni način ftps://",
+    "Local" : "Krajevno",
+    "Location" : "Mesto",
+    "ownCloud" : "ownCloud",
+    "Root" : "Koren",
+    "Share" : "Souporaba",
+    "Username as share" : "Uporabniško ime za souporabo",
+    "OpenStack Object Storage" : "Shramba predmeta OpenStack",
     "<b>Note:</b> " : "<b>Opomba:</b> ",
-    "and" : "in",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Opomba:</b> Podpora za naslove cURL v PHP ni omogočena, ali pa ni ustrezno nameščenih programov. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Opomba:</b> Podpora za protokol FTP v PHP ni omogočena, ali pa ni ustrezno nameščenih programov. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Opomba:</b> Program \"%s\" ni nameščen. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika.",
@@ -77,9 +63,9 @@
     "Folder name" : "Ime mape",
     "Configuration" : "Nastavitve",
     "Available for" : "Na voljo za",
-    "Add storage" : "Dodaj shrambo",
     "Advanced settings" : "Napredne nastavitve",
     "Delete" : "Izbriši",
+    "Add storage" : "Dodaj shrambo",
     "Enable User External Storage" : "Omogoči zunanjo uporabniško podatkovno shrambo",
     "Allow users to mount the following external storage" : "Dovoli uporabnikom priklapljanje navedenih zunanjih shramb."
 },"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"
diff --git a/apps/files_external/l10n/sq.js b/apps/files_external/l10n/sq.js
index 5a8c70406de..61262e8c8b1 100644
--- a/apps/files_external/l10n/sq.js
+++ b/apps/files_external/l10n/sq.js
@@ -1,15 +1,17 @@
 OC.L10N.register(
     "files_external",
     {
-    "Location" : "Vendndodhja",
-    "Port" : "Porta",
-    "Host" : "Pritësi",
+    "Personal" : "Personale",
+    "Saved" : "U ruajt",
+    "None" : "Asgjë",
     "Username" : "Përdoruesi",
     "Password" : "fjalëkalim",
-    "Share" : "Ndaj",
+    "Port" : "Porta",
+    "WebDAV" : "WebDAV",
     "URL" : "URL-i",
-    "Personal" : "Personale",
-    "Saved" : "U ruajt",
+    "Host" : "Pritësi",
+    "Location" : "Vendndodhja",
+    "Share" : "Ndaj",
     "Name" : "Emri",
     "Folder name" : "Emri i Skedarit",
     "Delete" : "Elimino"
diff --git a/apps/files_external/l10n/sq.json b/apps/files_external/l10n/sq.json
index d2abfb55bf5..20ebd508480 100644
--- a/apps/files_external/l10n/sq.json
+++ b/apps/files_external/l10n/sq.json
@@ -1,13 +1,15 @@
 { "translations": {
-    "Location" : "Vendndodhja",
-    "Port" : "Porta",
-    "Host" : "Pritësi",
+    "Personal" : "Personale",
+    "Saved" : "U ruajt",
+    "None" : "Asgjë",
     "Username" : "Përdoruesi",
     "Password" : "fjalëkalim",
-    "Share" : "Ndaj",
+    "Port" : "Porta",
+    "WebDAV" : "WebDAV",
     "URL" : "URL-i",
-    "Personal" : "Personale",
-    "Saved" : "U ruajt",
+    "Host" : "Pritësi",
+    "Location" : "Vendndodhja",
+    "Share" : "Ndaj",
     "Name" : "Emri",
     "Folder name" : "Emri i Skedarit",
     "Delete" : "Elimino"
diff --git a/apps/files_external/l10n/sr.js b/apps/files_external/l10n/sr.js
index 1609ac0191c..ddc5878f1f5 100644
--- a/apps/files_external/l10n/sr.js
+++ b/apps/files_external/l10n/sr.js
@@ -1,59 +1,18 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Преузимање тражених токена није успело. Проверите  да ли су Dropbox апликациони кључ и тајна тачни.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Преузимање приступних токена није успело. Проверите  да ли су Dropbox апликациони кључ и тајна тачни.",
-    "Please provide a valid Dropbox app key and secret." : "Унесите исправан кључ и тајну за Дропбокс апликацију.",
     "Step 1 failed. Exception: %s" : "Корак 1 није успео. Изузетак: %s",
     "Step 2 failed. Exception: %s" : "Корак 2 није успео. Изузетак: %s",
     "External storage" : "Спољашње складиште",
-    "Local" : "локална",
-    "Location" : "Локација",
-    "Amazon S3" : "Амазон С3",
-    "Key" : "Кључ",
-    "Secret" : "Тајна",
-    "Bucket" : "Канта",
-    "Amazon S3 and compliant" : "Амазон С3 и одговарајући",
-    "Access Key" : "Приступни кључ",
-    "Secret Key" : "Тајни кључ",
-    "Hostname" : "Име домаћина",
-    "Port" : "Порт",
-    "Region" : "Регија",
-    "Enable SSL" : "Омогући ССЛ",
-    "Enable Path Style" : "Омогући стил путање",
-    "App key" : "Кључ апликације",
-    "App secret" : "Тајна апликације",
-    "Host" : "Домаћин",
-    "Username" : "Корисничко име",
-    "Password" : "Лозинка",
-    "Remote subfolder" : "Удаљена потфасцикла",
-    "Secure ftps://" : "Сигурни ftps://",
-    "Client ID" : "ИД клијента",
-    "Client secret" : "Тајна клијента",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Регион (није обавезно за OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (потребан за Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (потребно за OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Лозинка (потребна за OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Име сервиса (потребно за OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Адреса идентитета крајње тачке (потребно за OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Време истека ХТТП захтева у секундама",
-    "Share" : "Дели",
-    "SMB / CIFS using OC login" : "СМБ/ЦИФС користећи оунКлауд пријаву",
-    "Username as share" : "Корисничко име као дељење",
-    "URL" : "УРЛ",
-    "Secure https://" : "Сигурни https://",
-    "SFTP with secret key login" : "СФТП са пријавом помоћу тајног кључа",
-    "Public key" : "Јавни кључ",
     "Storage with id \"%i\" not found" : "Складиште са идентификацијом \"%i\" није пронађено",
     "Invalid mount point" : "Неисправна тачка монтирања",
     "Invalid storage backend \"%s\"" : "Неисправна позадина складишта „%s“",
-    "Access granted" : "Приступ одобрен",
-    "Error configuring Dropbox storage" : "Грешка при подешавању Дропбокс складишта",
-    "Grant access" : "Одобри приступ",
-    "Error configuring Google Drive storage" : "Грешка при подешавању Гугл диск складишта",
     "Personal" : "Лично",
     "System" : "Систем",
+    "Grant access" : "Одобри приступ",
+    "Access granted" : "Приступ одобрен",
+    "Generate keys" : "Генериши кључеве",
+    "Error generating key pair" : "Грешка при генерисању пара кључева",
     "Enable encryption" : "Укључи шифровање",
     "Enable previews" : "Укључи прегледе",
     "Check for changes" : "Провери измене",
@@ -63,10 +22,36 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Сви корисници. Куцајте за избор корисника или групе.",
     "(group)" : "(група)",
     "Saved" : "Сачувано",
-    "Generate keys" : "Генериши кључеве",
-    "Error generating key pair" : "Грешка при генерисању пара кључева",
+    "None" : "Ништа",
+    "App key" : "Кључ апликације",
+    "App secret" : "Тајна апликације",
+    "Client ID" : "ИД клијента",
+    "Client secret" : "Тајна клијента",
+    "Username" : "Корисничко име",
+    "Password" : "Лозинка",
+    "API key" : "API кључ",
+    "Public key" : "Јавни кључ",
+    "Amazon S3" : "Амазон С3",
+    "Bucket" : "Канта",
+    "Hostname" : "Име домаћина",
+    "Port" : "Порт",
+    "Region" : "Регија",
+    "Enable SSL" : "Омогући ССЛ",
+    "Enable Path Style" : "Омогући стил путање",
+    "WebDAV" : "ВебДАВ",
+    "URL" : "УРЛ",
+    "Remote subfolder" : "Удаљена потфасцикла",
+    "Secure https://" : "Сигурни https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Домаћин",
+    "Secure ftps://" : "Сигурни ftps://",
+    "Local" : "локална",
+    "Location" : "Локација",
+    "ownCloud" : "оунКлауд",
+    "Share" : "Дели",
+    "Username as share" : "Корисничко име као дељење",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Напомена:</b> ",
-    "and" : "и",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Напомена:</b> cURL подршка за ПХП није омогућена или инсталирана. Монтирање %s није могуће. Затражите од вашег администратора система да је инсталира.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Напомена:</b> ФТП подршка за ПХП није омогућена или инсталирана. Монтирање %s није могуће. Затражите од вашег администратора система да је инсталира.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Напомена:</b> „%s“ није инсталирана. Монтирање %s није могуће. Затражите од вашег администратора система да је инсталира.",
@@ -79,9 +64,9 @@ OC.L10N.register(
     "Folder name" : "Назив фасцикле",
     "Configuration" : "Подешавање",
     "Available for" : "Доступно за",
-    "Add storage" : "Додај складиште",
     "Advanced settings" : "Напредне поставке",
     "Delete" : "Обриши",
+    "Add storage" : "Додај складиште",
     "Enable User External Storage" : "Укључи корисничко спољашње складиште",
     "Allow users to mount the following external storage" : "Дозволи корисницима да монтирају следећа спољашња складишта"
 },
diff --git a/apps/files_external/l10n/sr.json b/apps/files_external/l10n/sr.json
index b6a85b1e1b7..bc7dc4de21a 100644
--- a/apps/files_external/l10n/sr.json
+++ b/apps/files_external/l10n/sr.json
@@ -1,57 +1,16 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Преузимање тражених токена није успело. Проверите  да ли су Dropbox апликациони кључ и тајна тачни.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Преузимање приступних токена није успело. Проверите  да ли су Dropbox апликациони кључ и тајна тачни.",
-    "Please provide a valid Dropbox app key and secret." : "Унесите исправан кључ и тајну за Дропбокс апликацију.",
     "Step 1 failed. Exception: %s" : "Корак 1 није успео. Изузетак: %s",
     "Step 2 failed. Exception: %s" : "Корак 2 није успео. Изузетак: %s",
     "External storage" : "Спољашње складиште",
-    "Local" : "локална",
-    "Location" : "Локација",
-    "Amazon S3" : "Амазон С3",
-    "Key" : "Кључ",
-    "Secret" : "Тајна",
-    "Bucket" : "Канта",
-    "Amazon S3 and compliant" : "Амазон С3 и одговарајући",
-    "Access Key" : "Приступни кључ",
-    "Secret Key" : "Тајни кључ",
-    "Hostname" : "Име домаћина",
-    "Port" : "Порт",
-    "Region" : "Регија",
-    "Enable SSL" : "Омогући ССЛ",
-    "Enable Path Style" : "Омогући стил путање",
-    "App key" : "Кључ апликације",
-    "App secret" : "Тајна апликације",
-    "Host" : "Домаћин",
-    "Username" : "Корисничко име",
-    "Password" : "Лозинка",
-    "Remote subfolder" : "Удаљена потфасцикла",
-    "Secure ftps://" : "Сигурни ftps://",
-    "Client ID" : "ИД клијента",
-    "Client secret" : "Тајна клијента",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Регион (није обавезно за OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (потребан за Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (потребно за OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Лозинка (потребна за OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Име сервиса (потребно за OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Адреса идентитета крајње тачке (потребно за OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Време истека ХТТП захтева у секундама",
-    "Share" : "Дели",
-    "SMB / CIFS using OC login" : "СМБ/ЦИФС користећи оунКлауд пријаву",
-    "Username as share" : "Корисничко име као дељење",
-    "URL" : "УРЛ",
-    "Secure https://" : "Сигурни https://",
-    "SFTP with secret key login" : "СФТП са пријавом помоћу тајног кључа",
-    "Public key" : "Јавни кључ",
     "Storage with id \"%i\" not found" : "Складиште са идентификацијом \"%i\" није пронађено",
     "Invalid mount point" : "Неисправна тачка монтирања",
     "Invalid storage backend \"%s\"" : "Неисправна позадина складишта „%s“",
-    "Access granted" : "Приступ одобрен",
-    "Error configuring Dropbox storage" : "Грешка при подешавању Дропбокс складишта",
-    "Grant access" : "Одобри приступ",
-    "Error configuring Google Drive storage" : "Грешка при подешавању Гугл диск складишта",
     "Personal" : "Лично",
     "System" : "Систем",
+    "Grant access" : "Одобри приступ",
+    "Access granted" : "Приступ одобрен",
+    "Generate keys" : "Генериши кључеве",
+    "Error generating key pair" : "Грешка при генерисању пара кључева",
     "Enable encryption" : "Укључи шифровање",
     "Enable previews" : "Укључи прегледе",
     "Check for changes" : "Провери измене",
@@ -61,10 +20,36 @@
     "All users. Type to select user or group." : "Сви корисници. Куцајте за избор корисника или групе.",
     "(group)" : "(група)",
     "Saved" : "Сачувано",
-    "Generate keys" : "Генериши кључеве",
-    "Error generating key pair" : "Грешка при генерисању пара кључева",
+    "None" : "Ништа",
+    "App key" : "Кључ апликације",
+    "App secret" : "Тајна апликације",
+    "Client ID" : "ИД клијента",
+    "Client secret" : "Тајна клијента",
+    "Username" : "Корисничко име",
+    "Password" : "Лозинка",
+    "API key" : "API кључ",
+    "Public key" : "Јавни кључ",
+    "Amazon S3" : "Амазон С3",
+    "Bucket" : "Канта",
+    "Hostname" : "Име домаћина",
+    "Port" : "Порт",
+    "Region" : "Регија",
+    "Enable SSL" : "Омогући ССЛ",
+    "Enable Path Style" : "Омогући стил путање",
+    "WebDAV" : "ВебДАВ",
+    "URL" : "УРЛ",
+    "Remote subfolder" : "Удаљена потфасцикла",
+    "Secure https://" : "Сигурни https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Домаћин",
+    "Secure ftps://" : "Сигурни ftps://",
+    "Local" : "локална",
+    "Location" : "Локација",
+    "ownCloud" : "оунКлауд",
+    "Share" : "Дели",
+    "Username as share" : "Корисничко име као дељење",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Напомена:</b> ",
-    "and" : "и",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Напомена:</b> cURL подршка за ПХП није омогућена или инсталирана. Монтирање %s није могуће. Затражите од вашег администратора система да је инсталира.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Напомена:</b> ФТП подршка за ПХП није омогућена или инсталирана. Монтирање %s није могуће. Затражите од вашег администратора система да је инсталира.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Напомена:</b> „%s“ није инсталирана. Монтирање %s није могуће. Затражите од вашег администратора система да је инсталира.",
@@ -77,9 +62,9 @@
     "Folder name" : "Назив фасцикле",
     "Configuration" : "Подешавање",
     "Available for" : "Доступно за",
-    "Add storage" : "Додај складиште",
     "Advanced settings" : "Напредне поставке",
     "Delete" : "Обриши",
+    "Add storage" : "Додај складиште",
     "Enable User External Storage" : "Укључи корисничко спољашње складиште",
     "Allow users to mount the following external storage" : "Дозволи корисницима да монтирају следећа спољашња складишта"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
diff --git a/apps/files_external/l10n/sr@latin.js b/apps/files_external/l10n/sr@latin.js
index bac947bc124..64301b4a026 100644
--- a/apps/files_external/l10n/sr@latin.js
+++ b/apps/files_external/l10n/sr@latin.js
@@ -1,59 +1,42 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Dobavljanje detalja zahteva nije uspelo. Proverite da li su Vaš ključ aplikacije za Dropbox i tajna lozinka ispravni.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Dobavljanje detalja pristupa nije uspelo. Proverite da li su Vaš Dropbox ključ aplikacije i tajna lozinka ispravni.",
-    "Please provide a valid Dropbox app key and secret." : "Molimo unesite ispravan Dropbox ključ aplikacije i tajnu lozinku.",
     "Step 1 failed. Exception: %s" : "Korak 1 nije uspeo. Izuzetak: %s",
     "Step 2 failed. Exception: %s" : "Korak 2 nije uspeo. Izuzetak: %s",
     "External storage" : "Spoljašnje skladište",
-    "Local" : "Lokalno",
-    "Location" : "Lokacija",
+    "Personal" : "Lično",
+    "System" : "Sistemsko",
+    "Grant access" : "Dozvoli pristup",
+    "Access granted" : "Pristup Dozvoljen",
+    "All users. Type to select user or group." : "Svi korisnici. Kucajte da biste izabrali korisnika ili grupu.",
+    "(group)" : "(grupa)",
+    "Saved" : "Sačuvano",
+    "App key" : "Ključ Aplikacije",
+    "App secret" : "Tajna lozinka Aplikacije",
+    "Client ID" : "Identifikator klijenta",
+    "Client secret" : "Tajna lozinka klijenta",
+    "Username" : "Korisničko ime",
+    "Password" : "Lozinka",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Ključ",
-    "Secret" : "Tajna lozinka",
     "Bucket" : "Korpa",
-    "Amazon S3 and compliant" : "Amazon S3 i kompatibilni",
-    "Access Key" : "Pristupni Ključ",
-    "Secret Key" : "Tajni Ključ",
     "Hostname" : "Ime računara",
     "Port" : "Port",
     "Region" : "Regija",
     "Enable SSL" : "Uključi SSL",
     "Enable Path Style" : "Omogući stil putanje",
-    "App key" : "Ključ Aplikacije",
-    "App secret" : "Tajna lozinka Aplikacije",
-    "Host" : "Računar",
-    "Username" : "Korisničko ime",
-    "Password" : "Lozinka",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Remote subfolder" : "Udaljeni poddirektorijum",
+    "Secure https://" : "Sigurni https://",
+    "Host" : "Računar",
     "Secure ftps://" : "Sigurni ftps://",
-    "Client ID" : "Identifikator klijenta",
-    "Client secret" : "Tajna lozinka klijenta",
-    "OpenStack Object Storage" : "OpenStack skladište objekata",
-    "Region (optional for OpenStack Object Storage)" : "Region (opciono za OpenStack skladište objekata)",
-    "API Key (required for Rackspace Cloud Files)" : "API ključ (neophodno za Rackspace datoteke u oblaku)",
-    "Tenantname (required for OpenStack Object Storage)" : "Ime stanara (neophodno za OpenStack skladište objekata)",
-    "Password (required for OpenStack Object Storage)" : "Lozinka (neophodno za OpenStack skladište objekata)",
-    "Service Name (required for OpenStack Object Storage)" : "Ime Servisa (neophodno za OpenStack skladište objekata)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL krajnje tačke identiteta (neophodno za OpenStack skladište objekata)",
-    "Timeout of HTTP requests in seconds" : "Ograničenje vremena veze HTTP zahteva u sekundama",
+    "Local" : "Lokalno",
+    "Location" : "Lokacija",
+    "Root" : "Koren",
     "Share" : "Podeli",
-    "SMB / CIFS using OC login" : "SMB / CIFS koji koristi OC prijavljivanje",
     "Username as share" : "Korisničko ime i deljeni direktorijum",
-    "URL" : "URL",
-    "Secure https://" : "Sigurni https://",
-    "Access granted" : "Pristup Dozvoljen",
-    "Error configuring Dropbox storage" : "Greška u podešavanju Dropbox skladišta",
-    "Grant access" : "Dozvoli pristup",
-    "Error configuring Google Drive storage" : "Greška u podešavanju Google Disk skladišta",
-    "Personal" : "Lično",
-    "System" : "Sistemsko",
-    "All users. Type to select user or group." : "Svi korisnici. Kucajte da biste izabrali korisnika ili grupu.",
-    "(group)" : "(grupa)",
-    "Saved" : "Sačuvano",
+    "OpenStack Object Storage" : "OpenStack skladište objekata",
     "<b>Note:</b> " : "<b>Obratite pažnju:</b>",
-    "and" : "i",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Obratite pažnju</b> Podrška za cURL u PHP-u nije uključena ili instalirana. Montiranje %s nije moguće. Molimo Vas da se obratite Vašem sistem administratoru da je instalira.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Obratite pažnju:</b> FTP podrška u PHP-u nije uključena ili instalirana. Montiranje %s nije moguće. Molimo Vas da tražite od Vašeg sistem administratora da je instalira.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Obratite pažnju:</b> \"%s\" nije instaliran. Monitranje %s nije moguće. Molimo Vas da se obratite Vašem sistem administratoru da to instalira.",
@@ -64,8 +47,8 @@ OC.L10N.register(
     "Folder name" : "Ime fascikle",
     "Configuration" : "Podešavanje",
     "Available for" : "Dostupno za",
-    "Add storage" : "Dodaj skladište",
     "Delete" : "Obriši",
+    "Add storage" : "Dodaj skladište",
     "Enable User External Storage" : "Omogući korisničko spoljašnje skladište",
     "Allow users to mount the following external storage" : "Omogući korisnicima da namontiraju sledeće spoljašnje skladište"
 },
diff --git a/apps/files_external/l10n/sr@latin.json b/apps/files_external/l10n/sr@latin.json
index 2dfab1ba06a..72fc20844bd 100644
--- a/apps/files_external/l10n/sr@latin.json
+++ b/apps/files_external/l10n/sr@latin.json
@@ -1,57 +1,40 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Dobavljanje detalja zahteva nije uspelo. Proverite da li su Vaš ključ aplikacije za Dropbox i tajna lozinka ispravni.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Dobavljanje detalja pristupa nije uspelo. Proverite da li su Vaš Dropbox ključ aplikacije i tajna lozinka ispravni.",
-    "Please provide a valid Dropbox app key and secret." : "Molimo unesite ispravan Dropbox ključ aplikacije i tajnu lozinku.",
     "Step 1 failed. Exception: %s" : "Korak 1 nije uspeo. Izuzetak: %s",
     "Step 2 failed. Exception: %s" : "Korak 2 nije uspeo. Izuzetak: %s",
     "External storage" : "Spoljašnje skladište",
-    "Local" : "Lokalno",
-    "Location" : "Lokacija",
+    "Personal" : "Lično",
+    "System" : "Sistemsko",
+    "Grant access" : "Dozvoli pristup",
+    "Access granted" : "Pristup Dozvoljen",
+    "All users. Type to select user or group." : "Svi korisnici. Kucajte da biste izabrali korisnika ili grupu.",
+    "(group)" : "(grupa)",
+    "Saved" : "Sačuvano",
+    "App key" : "Ključ Aplikacije",
+    "App secret" : "Tajna lozinka Aplikacije",
+    "Client ID" : "Identifikator klijenta",
+    "Client secret" : "Tajna lozinka klijenta",
+    "Username" : "Korisničko ime",
+    "Password" : "Lozinka",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Ključ",
-    "Secret" : "Tajna lozinka",
     "Bucket" : "Korpa",
-    "Amazon S3 and compliant" : "Amazon S3 i kompatibilni",
-    "Access Key" : "Pristupni Ključ",
-    "Secret Key" : "Tajni Ključ",
     "Hostname" : "Ime računara",
     "Port" : "Port",
     "Region" : "Regija",
     "Enable SSL" : "Uključi SSL",
     "Enable Path Style" : "Omogući stil putanje",
-    "App key" : "Ključ Aplikacije",
-    "App secret" : "Tajna lozinka Aplikacije",
-    "Host" : "Računar",
-    "Username" : "Korisničko ime",
-    "Password" : "Lozinka",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Remote subfolder" : "Udaljeni poddirektorijum",
+    "Secure https://" : "Sigurni https://",
+    "Host" : "Računar",
     "Secure ftps://" : "Sigurni ftps://",
-    "Client ID" : "Identifikator klijenta",
-    "Client secret" : "Tajna lozinka klijenta",
-    "OpenStack Object Storage" : "OpenStack skladište objekata",
-    "Region (optional for OpenStack Object Storage)" : "Region (opciono za OpenStack skladište objekata)",
-    "API Key (required for Rackspace Cloud Files)" : "API ključ (neophodno za Rackspace datoteke u oblaku)",
-    "Tenantname (required for OpenStack Object Storage)" : "Ime stanara (neophodno za OpenStack skladište objekata)",
-    "Password (required for OpenStack Object Storage)" : "Lozinka (neophodno za OpenStack skladište objekata)",
-    "Service Name (required for OpenStack Object Storage)" : "Ime Servisa (neophodno za OpenStack skladište objekata)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL krajnje tačke identiteta (neophodno za OpenStack skladište objekata)",
-    "Timeout of HTTP requests in seconds" : "Ograničenje vremena veze HTTP zahteva u sekundama",
+    "Local" : "Lokalno",
+    "Location" : "Lokacija",
+    "Root" : "Koren",
     "Share" : "Podeli",
-    "SMB / CIFS using OC login" : "SMB / CIFS koji koristi OC prijavljivanje",
     "Username as share" : "Korisničko ime i deljeni direktorijum",
-    "URL" : "URL",
-    "Secure https://" : "Sigurni https://",
-    "Access granted" : "Pristup Dozvoljen",
-    "Error configuring Dropbox storage" : "Greška u podešavanju Dropbox skladišta",
-    "Grant access" : "Dozvoli pristup",
-    "Error configuring Google Drive storage" : "Greška u podešavanju Google Disk skladišta",
-    "Personal" : "Lično",
-    "System" : "Sistemsko",
-    "All users. Type to select user or group." : "Svi korisnici. Kucajte da biste izabrali korisnika ili grupu.",
-    "(group)" : "(grupa)",
-    "Saved" : "Sačuvano",
+    "OpenStack Object Storage" : "OpenStack skladište objekata",
     "<b>Note:</b> " : "<b>Obratite pažnju:</b>",
-    "and" : "i",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Obratite pažnju</b> Podrška za cURL u PHP-u nije uključena ili instalirana. Montiranje %s nije moguće. Molimo Vas da se obratite Vašem sistem administratoru da je instalira.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Obratite pažnju:</b> FTP podrška u PHP-u nije uključena ili instalirana. Montiranje %s nije moguće. Molimo Vas da tražite od Vašeg sistem administratora da je instalira.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Obratite pažnju:</b> \"%s\" nije instaliran. Monitranje %s nije moguće. Molimo Vas da se obratite Vašem sistem administratoru da to instalira.",
@@ -62,8 +45,8 @@
     "Folder name" : "Ime fascikle",
     "Configuration" : "Podešavanje",
     "Available for" : "Dostupno za",
-    "Add storage" : "Dodaj skladište",
     "Delete" : "Obriši",
+    "Add storage" : "Dodaj skladište",
     "Enable User External Storage" : "Omogući korisničko spoljašnje skladište",
     "Allow users to mount the following external storage" : "Omogući korisnicima da namontiraju sledeće spoljašnje skladište"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
diff --git a/apps/files_external/l10n/sv.js b/apps/files_external/l10n/sv.js
index 3a3f321297e..08175a56562 100644
--- a/apps/files_external/l10n/sv.js
+++ b/apps/files_external/l10n/sv.js
@@ -1,60 +1,47 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Misslyckades att hämta access tokens. Verifiera att din Dropbox app-nyckel och app-hemlighet är korrekt",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Misslyckades att hämta request tokens. Verifiera att din Dropbox app-nyckel och app-hemlighet är korrekt",
-    "Please provide a valid Dropbox app key and secret." : "Ange en giltig Dropbox nyckel och hemlighet.",
     "Step 1 failed. Exception: %s" : "Steg 1 flaerade. Undantag: %s",
     "Step 2 failed. Exception: %s" : "Steg 2 falerade. Undantag: %s",
     "External storage" : "Extern lagring",
-    "Local" : "Lokal",
-    "Location" : "Plats",
+    "Personal" : "Personligt",
+    "System" : "System",
+    "Grant access" : "Bevilja åtkomst",
+    "Access granted" : "Åtkomst beviljad",
+    "All users. Type to select user or group." : "Alla användare. Skriv för att välja användare eller grupp.",
+    "(group)" : "(grupp)",
+    "Saved" : "Sparad",
+    "None" : "Ingen",
+    "App key" : "App-nyckel",
+    "App secret" : "App-hemlighet",
+    "Client ID" : "Klient ID",
+    "Client secret" : "klient secret",
+    "Username" : "Användarnamn",
+    "Password" : "Lösenord",
+    "API key" : "API-nyckel",
+    "Public key" : "Publik nyckel",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Nyckel",
-    "Secret" : "Hemlig",
     "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 och compliant",
-    "Access Key" : "Accessnyckel",
-    "Secret Key" : "Hemlig nyckel",
     "Hostname" : "Värdnamn",
     "Port" : "Port",
     "Region" : "Län",
     "Enable SSL" : "Aktivera SSL",
     "Enable Path Style" : "Aktivera Path Style",
-    "App key" : "App-nyckel",
-    "App secret" : "App-hemlighet",
-    "Host" : "Server",
-    "Username" : "Användarnamn",
-    "Password" : "Lösenord",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Remote subfolder" : "Fjärrmapp",
+    "Secure https://" : "Säker https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Server",
     "Secure ftps://" : "Säker ftps://",
-    "Client ID" : "Klient ID",
-    "Client secret" : "klient secret",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Region (valfritt för OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API-nyckel (krävs för Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (krävs för OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Lösenord (krävs för OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Tjänstens namn (krävs för OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL för identitetens slutpunkt (krävs för OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Timeout för HTTP-anrop i sekunder",
+    "Local" : "Lokal",
+    "Location" : "Plats",
+    "ownCloud" : "ownCloud",
+    "Root" : "Root",
     "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://",
-    "Public key" : "Publik nyckel",
-    "Access granted" : "Åtkomst beviljad",
-    "Error configuring Dropbox storage" : "Fel vid konfigurering av Dropbox",
-    "Grant access" : "Bevilja åtkomst",
-    "Error configuring Google Drive storage" : "Fel vid konfigurering av Google Drive",
-    "Personal" : "Personligt",
-    "System" : "System",
-    "All users. Type to select user or group." : "Alla användare. Skriv för att välja användare eller grupp.",
-    "(group)" : "(grupp)",
-    "Saved" : "Sparad",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b> OBS: </ b>",
-    "and" : "och",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b> OBS: </ b> cURL-stöd i PHP inte är aktiverat eller installerat. Montering av %s är inte möjlig. Be din systemadministratör att installera det.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b> OBS: </ b> FTP-stödet i PHP inte är aktiverat eller installerat. Montering av %s är inte möjlig. Be din systemadministratör att installera det.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b> OBS: </ b> \"%s\" är inte installerat. Montering av %s är inte möjlig. Be din systemadministratör att installera det.",
@@ -65,8 +52,8 @@ OC.L10N.register(
     "Folder name" : "Mappnamn",
     "Configuration" : "Konfiguration",
     "Available for" : "Tillgänglig för",
-    "Add storage" : "Lägg till lagring",
     "Delete" : "Radera",
+    "Add storage" : "Lägg till lagring",
     "Enable User External Storage" : "Aktivera extern lagring för användare",
     "Allow users to mount the following external storage" : "Tillåt användare att montera följande extern lagring"
 },
diff --git a/apps/files_external/l10n/sv.json b/apps/files_external/l10n/sv.json
index 7a800775451..c44ad337ab3 100644
--- a/apps/files_external/l10n/sv.json
+++ b/apps/files_external/l10n/sv.json
@@ -1,58 +1,45 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Misslyckades att hämta access tokens. Verifiera att din Dropbox app-nyckel och app-hemlighet är korrekt",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Misslyckades att hämta request tokens. Verifiera att din Dropbox app-nyckel och app-hemlighet är korrekt",
-    "Please provide a valid Dropbox app key and secret." : "Ange en giltig Dropbox nyckel och hemlighet.",
     "Step 1 failed. Exception: %s" : "Steg 1 flaerade. Undantag: %s",
     "Step 2 failed. Exception: %s" : "Steg 2 falerade. Undantag: %s",
     "External storage" : "Extern lagring",
-    "Local" : "Lokal",
-    "Location" : "Plats",
+    "Personal" : "Personligt",
+    "System" : "System",
+    "Grant access" : "Bevilja åtkomst",
+    "Access granted" : "Åtkomst beviljad",
+    "All users. Type to select user or group." : "Alla användare. Skriv för att välja användare eller grupp.",
+    "(group)" : "(grupp)",
+    "Saved" : "Sparad",
+    "None" : "Ingen",
+    "App key" : "App-nyckel",
+    "App secret" : "App-hemlighet",
+    "Client ID" : "Klient ID",
+    "Client secret" : "klient secret",
+    "Username" : "Användarnamn",
+    "Password" : "Lösenord",
+    "API key" : "API-nyckel",
+    "Public key" : "Publik nyckel",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Nyckel",
-    "Secret" : "Hemlig",
     "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 och compliant",
-    "Access Key" : "Accessnyckel",
-    "Secret Key" : "Hemlig nyckel",
     "Hostname" : "Värdnamn",
     "Port" : "Port",
     "Region" : "Län",
     "Enable SSL" : "Aktivera SSL",
     "Enable Path Style" : "Aktivera Path Style",
-    "App key" : "App-nyckel",
-    "App secret" : "App-hemlighet",
-    "Host" : "Server",
-    "Username" : "Användarnamn",
-    "Password" : "Lösenord",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Remote subfolder" : "Fjärrmapp",
+    "Secure https://" : "Säker https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Server",
     "Secure ftps://" : "Säker ftps://",
-    "Client ID" : "Klient ID",
-    "Client secret" : "klient secret",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Region (valfritt för OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API-nyckel (krävs för Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (krävs för OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Lösenord (krävs för OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Tjänstens namn (krävs för OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL för identitetens slutpunkt (krävs för OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Timeout för HTTP-anrop i sekunder",
+    "Local" : "Lokal",
+    "Location" : "Plats",
+    "ownCloud" : "ownCloud",
+    "Root" : "Root",
     "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://",
-    "Public key" : "Publik nyckel",
-    "Access granted" : "Åtkomst beviljad",
-    "Error configuring Dropbox storage" : "Fel vid konfigurering av Dropbox",
-    "Grant access" : "Bevilja åtkomst",
-    "Error configuring Google Drive storage" : "Fel vid konfigurering av Google Drive",
-    "Personal" : "Personligt",
-    "System" : "System",
-    "All users. Type to select user or group." : "Alla användare. Skriv för att välja användare eller grupp.",
-    "(group)" : "(grupp)",
-    "Saved" : "Sparad",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b> OBS: </ b>",
-    "and" : "och",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b> OBS: </ b> cURL-stöd i PHP inte är aktiverat eller installerat. Montering av %s är inte möjlig. Be din systemadministratör att installera det.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b> OBS: </ b> FTP-stödet i PHP inte är aktiverat eller installerat. Montering av %s är inte möjlig. Be din systemadministratör att installera det.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b> OBS: </ b> \"%s\" är inte installerat. Montering av %s är inte möjlig. Be din systemadministratör att installera det.",
@@ -63,8 +50,8 @@
     "Folder name" : "Mappnamn",
     "Configuration" : "Konfiguration",
     "Available for" : "Tillgänglig för",
-    "Add storage" : "Lägg till lagring",
     "Delete" : "Radera",
+    "Add storage" : "Lägg till lagring",
     "Enable User External Storage" : "Aktivera extern lagring för användare",
     "Allow users to mount the following external storage" : "Tillåt användare att montera följande extern lagring"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/ta_LK.js b/apps/files_external/l10n/ta_LK.js
index 274f2dcf34c..382d5e943a1 100644
--- a/apps/files_external/l10n/ta_LK.js
+++ b/apps/files_external/l10n/ta_LK.js
@@ -1,20 +1,19 @@
 OC.L10N.register(
     "files_external",
     {
-    "Please provide a valid Dropbox app key and secret." : "தயவுசெய்து ஒரு செல்லுபடியான Dropbox செயலி சாவி மற்றும் இரகசியத்தை வழங்குக. ",
-    "Location" : "இடம்",
+    "Personal" : "தனிப்பட்ட",
+    "Grant access" : "அனுமதியை வழங்கல்",
+    "Access granted" : "அனுமதி வழங்கப்பட்டது",
+    "None" : "ஒன்றுமில்லை",
+    "Username" : "பயனாளர் பெயர்",
+    "Password" : "கடவுச்சொல்",
     "Port" : "துறை ",
     "Region" : "பிரதேசம்",
+    "URL" : "URL",
     "Host" : "ஓம்புனர்",
-    "Username" : "பயனாளர் பெயர்",
-    "Password" : "கடவுச்சொல்",
+    "Location" : "இடம்",
+    "ownCloud" : "OwnCloud",
     "Share" : "பகிர்வு",
-    "URL" : "URL",
-    "Access granted" : "அனுமதி வழங்கப்பட்டது",
-    "Error configuring Dropbox storage" : "Dropbox சேமிப்பை தகவமைப்பதில் வழு",
-    "Grant access" : "அனுமதியை வழங்கல்",
-    "Error configuring Google Drive storage" : "Google இயக்க சேமிப்பகத்தை தகமைப்பதில் வழு",
-    "Personal" : "தனிப்பட்ட",
     "Name" : "பெயர்",
     "External Storage" : "வெளி சேமிப்பு",
     "Folder name" : "கோப்புறை பெயர்",
diff --git a/apps/files_external/l10n/ta_LK.json b/apps/files_external/l10n/ta_LK.json
index 6d9b600b56b..c838cbe0173 100644
--- a/apps/files_external/l10n/ta_LK.json
+++ b/apps/files_external/l10n/ta_LK.json
@@ -1,18 +1,17 @@
 { "translations": {
-    "Please provide a valid Dropbox app key and secret." : "தயவுசெய்து ஒரு செல்லுபடியான Dropbox செயலி சாவி மற்றும் இரகசியத்தை வழங்குக. ",
-    "Location" : "இடம்",
+    "Personal" : "தனிப்பட்ட",
+    "Grant access" : "அனுமதியை வழங்கல்",
+    "Access granted" : "அனுமதி வழங்கப்பட்டது",
+    "None" : "ஒன்றுமில்லை",
+    "Username" : "பயனாளர் பெயர்",
+    "Password" : "கடவுச்சொல்",
     "Port" : "துறை ",
     "Region" : "பிரதேசம்",
+    "URL" : "URL",
     "Host" : "ஓம்புனர்",
-    "Username" : "பயனாளர் பெயர்",
-    "Password" : "கடவுச்சொல்",
+    "Location" : "இடம்",
+    "ownCloud" : "OwnCloud",
     "Share" : "பகிர்வு",
-    "URL" : "URL",
-    "Access granted" : "அனுமதி வழங்கப்பட்டது",
-    "Error configuring Dropbox storage" : "Dropbox சேமிப்பை தகவமைப்பதில் வழு",
-    "Grant access" : "அனுமதியை வழங்கல்",
-    "Error configuring Google Drive storage" : "Google இயக்க சேமிப்பகத்தை தகமைப்பதில் வழு",
-    "Personal" : "தனிப்பட்ட",
     "Name" : "பெயர்",
     "External Storage" : "வெளி சேமிப்பு",
     "Folder name" : "கோப்புறை பெயர்",
diff --git a/apps/files_external/l10n/te.js b/apps/files_external/l10n/te.js
index b1f0e091c26..155676d9a8f 100644
--- a/apps/files_external/l10n/te.js
+++ b/apps/files_external/l10n/te.js
@@ -1,9 +1,9 @@
 OC.L10N.register(
     "files_external",
     {
+    "Personal" : "వ్యక్తిగతం",
     "Username" : "వాడుకరి పేరు",
     "Password" : "సంకేతపదం",
-    "Personal" : "వ్యక్తిగతం",
     "Name" : "పేరు",
     "Folder name" : "సంచయం పేరు",
     "Delete" : "తొలగించు"
diff --git a/apps/files_external/l10n/te.json b/apps/files_external/l10n/te.json
index 4a6f3caba86..5a55f60376a 100644
--- a/apps/files_external/l10n/te.json
+++ b/apps/files_external/l10n/te.json
@@ -1,7 +1,7 @@
 { "translations": {
+    "Personal" : "వ్యక్తిగతం",
     "Username" : "వాడుకరి పేరు",
     "Password" : "సంకేతపదం",
-    "Personal" : "వ్యక్తిగతం",
     "Name" : "పేరు",
     "Folder name" : "సంచయం పేరు",
     "Delete" : "తొలగించు"
diff --git a/apps/files_external/l10n/th_TH.js b/apps/files_external/l10n/th_TH.js
index ba2271f5f89..34c1f74ecf8 100644
--- a/apps/files_external/l10n/th_TH.js
+++ b/apps/files_external/l10n/th_TH.js
@@ -1,59 +1,29 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "ร้องขอโทเค็นล้มเหลว กรุณาตรวจสอบแอพฯคีย์และ Secret ของ Dropbox ของคุณว่าถูกต้องหรือไม่",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "โทเค็นการเข้าถึงล้มเหลว กรุณาตรวจสอบแอพฯคีย์และ Secret ของ Dropbox ของคุณว่าถูกต้องหรือไม่",
-    "Please provide a valid Dropbox app key and secret." : "กรุณากรอกรหัส app key ของ Dropbox และรหัสลับ",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "การเรียกร้องขอโทเคนล้มเหลว โปรดตรวจสอบคีย์และรหัสลับให้ถูกต้อง",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "การเรียกร้องขอโทเคนล้มเหลว โปรดตรวจสอบคีย์และรหัสลับของแอพฯ ให้ถูกต้อง",
+    "Please provide a valid app key and secret." : "โปรดระบุคีย์และรหัสลับของแอพฯ ให้ถูกต้อง",
     "Step 1 failed. Exception: %s" : "ขั้นตอนที่ 1 ล้มเหลว ข้อยกเว้น: %s",
     "Step 2 failed. Exception: %s" : "ขั้นตอนที่ 2 ล้มเหลว ข้อยกเว้น: %s",
     "External storage" : "จัดเก็บข้อมูลภายนอก",
-    "Local" : "ต้นทาง",
-    "Location" : "ตำแหน่งที่อยู่",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "รหัส",
-    "Secret" : "Secret",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 และ Compliant",
-    "Access Key" : "รหัสการเข้าถึง",
-    "Secret Key" : "รหัสลับ",
-    "Hostname" : "ชื่อโฮสต์",
-    "Port" : "พอร์ต",
-    "Region" : "พื้นที่",
-    "Enable SSL" : "เปิดใช้งาน SSL",
-    "Enable Path Style" : "เปิดใช้งานสไตล์เส้นทาง",
-    "App key" : "App key",
-    "App secret" : "App secret",
-    "Host" : "โฮสต์",
-    "Username" : "ชื่อผู้ใช้งาน",
-    "Password" : "รหัสผ่าน",
-    "Remote subfolder" : "โฟลเดอร์ย่อยระยะไกล",
-    "Secure ftps://" : "โหมดปลอดภัย ftps://",
-    "Client ID" : "Client ID",
-    "Client secret" : "Client secret",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "ภูมิภาค (จำเป็นสำหรับ OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (จำเป็นสำหรับ Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "ชื่อผู้เช่า (จำเป็นสำหรับ OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "รหัสผ่าน (ที่จำเป็นสำหรับ OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "ชื่อบริการ (จำเป็นสำหรับ OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "ตัวตนของ URL ปลายทาง (จำเป็นสำหรับ OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "หมดเวลาของการร้องขอ HTTP ในไม่กี่วินาที",
-    "Share" : "แชร์",
-    "SMB / CIFS using OC login" : "SMB/CIFS กำลังใช้ OC เข้าสู่ระบบ",
-    "Username as share" : "ชื่อผู้ใช้ที่แชร์",
-    "URL" : "URL",
-    "Secure https://" : "โหมดปลอดภัย https://",
-    "SFTP with secret key login" : "SFTP กับคีย์ลับสำหรับเข้าสู่ระบบ",
-    "Public key" : "คีย์สาธารณะ",
     "Storage with id \"%i\" not found" : "ไม่พบจัดการเก็บข้อมูลของ ID \"%i\"",
+    "Invalid backend or authentication mechanism class" : "แบ็กเอนด์ไม่ถูกต้องหรือระดับการรับรองความถูกต้องไม่เพียงพอ",
     "Invalid mount point" : "จุดเชื่อมต่อที่ไม่ถูกต้อง",
+    "Objectstore forbidden" : "เก็บวัตถุต้องห้าม",
     "Invalid storage backend \"%s\"" : "การจัดเก็บข้อมูลแบ็กเอนด์ไม่ถูกต้อง \"%s\"",
-    "Access granted" : "การเข้าถึงได้รับอนุญาตแล้ว",
-    "Error configuring Dropbox storage" : "เกิดข้อผิดพลาดในการกำหนดค่าพื้นที่จัดเก็บข้อมูล Dropbox",
-    "Grant access" : "อนุญาตให้เข้าถึงได้",
-    "Error configuring Google Drive storage" : "เกิดข้อผิดพลาดในการกำหนดค่าการจัดเก็บข้อมูลในพื้นที่ของ Google Drive",
+    "Not permitted to use backend \"%s\"" : "ไม่อนุญาตให้ใช้แบ็กเอนด์ \"%s\"",
+    "Not permitted to use authentication mechanism \"%s\"" : "ไม่อนุญาตให้ตรวจสอบการรับรองความถูกต้อง \"%s\"",
+    "Unsatisfied backend parameters" : "พารามิเตอร์แบ็กเอนด์ไม่ได้รับอนุญาต",
+    "Unsatisfied authentication mechanism parameters" : "การรับรองความถูกต้องไม่เพียงพอ",
     "Personal" : "ส่วนตัว",
     "System" : "ระบบ",
+    "Grant access" : "อนุญาตให้เข้าถึงได้",
+    "Access granted" : "การเข้าถึงได้รับอนุญาตแล้ว",
+    "Error configuring OAuth1" : "ข้อผิดพลาดในการกำหนดค่า OAuth1",
+    "Error configuring OAuth2" : "ข้อผิดพลาดในการกำหนดค่า OAuth2",
+    "Generate keys" : "สร้างคีย์",
+    "Error generating key pair" : "ข้อผิดพลาดในการสร้างคีย์แบบเป็นคู่",
     "Enable encryption" : "เปิดใช้งานการเข้ารหัส",
     "Enable previews" : "เปิดใช้งานการแสดงตัวอย่าง",
     "Check for changes" : "ตรวจสอบการเปลี่ยนแปลง",
@@ -63,10 +33,57 @@ OC.L10N.register(
     "All users. Type to select user or group." : "ผู้ใช้ทุกคน พิมพ์เพื่อเลือกผู้ใช้หรือกลุ่ม",
     "(group)" : "(กลุ่ม)",
     "Saved" : "บันทึกแล้ว",
-    "Generate keys" : "สร้างคีย์",
-    "Error generating key pair" : "ข้อผิดพลาดในการสร้างคีย์แบบเป็นคู่",
+    "Access key" : "คีย์การเข้าถึง",
+    "Secret key" : "คีย์ลับ",
+    "Builtin" : "ในตัว",
+    "None" : "ไม่มี",
+    "OAuth1" : "OAuth1",
+    "App key" : "App key",
+    "App secret" : "App secret",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "Client ID",
+    "Client secret" : "Client secret",
+    "OpenStack" : "OpenStack",
+    "Username" : "ชื่อผู้ใช้งาน",
+    "Password" : "รหัสผ่าน",
+    "Tenant name" : "ชื่อผู้เช่า",
+    "Identity endpoint URL" : "ตัวตนของ URL ปลายทาง",
+    "Rackspace" : "Rackspace",
+    "API key" : "รหัส API",
+    "Username and password" : "ชื่อผู้ใช้และรหัสผ่าน",
+    "Session credentials" : "ข้อมูลของเซสชั่น",
+    "RSA public key" : "RSA คีย์สาธารณะ",
+    "Public key" : "คีย์สาธารณะ",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "ชื่อโฮสต์",
+    "Port" : "พอร์ต",
+    "Region" : "พื้นที่",
+    "Enable SSL" : "เปิดใช้งาน SSL",
+    "Enable Path Style" : "เปิดใช้งานสไตล์เส้นทาง",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "โฟลเดอร์ย่อยระยะไกล",
+    "Secure https://" : "โหมดปลอดภัย https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "โฮสต์",
+    "Secure ftps://" : "โหมดปลอดภัย ftps://",
+    "Google Drive" : "กูเกิ้ลไดร์ฟ",
+    "Local" : "ต้นทาง",
+    "Location" : "ตำแหน่งที่อยู่",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "รูท",
+    "SFTP with secret key login [DEPRECATED]" : "SFTP กับรหัสลับเข้าสู่ระบบ [ยกเลิก]",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "แชร์",
+    "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS กำลังใช้ OC เข้าสู่ระบบ [ยกเลิก]",
+    "Username as share" : "ชื่อผู้ใช้ที่แชร์",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Service name" : "ชื่อบริการ",
+    "Request timeout (seconds)" : "หมดเวลาการร้องขอ (วินาที)",
     "<b>Note:</b> " : "<b>หมายเหตุ:</b>",
-    "and" : "และ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>หมายเหตุ:</b> การสนับสนุน cURL ใน PHP ไม่ได้เปิดใช้งานหรือติดตั้ง %s เป็นไปไม่ได้ กรุณาขอให้ผู้ดูแลระบบของคุณติดตั้งมัน",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>หมายเหตุ:</b> การสนับสนุน FTP ใน PHP ไม่ได้เปิดใช้งานหรือติดตั้ง %s เป็นไปไม่ได้ กรุณาขอให้ผู้ดูแลระบบของคุณติดตั้งมัน",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>หมายเหตุ:</b> %s ไม่ได้ติดตั้ง การติดตั้ง %s เป็นไปไม่ได้ กรุณาขอให้ผู้ดูแลระบบของคุณติดตั้งมัน",
@@ -77,11 +94,12 @@ OC.L10N.register(
     "Scope" : "ขอบเขต",
     "External Storage" : "พื้นทีจัดเก็บข้อมูลจากภายนอก",
     "Folder name" : "ชื่อโฟลเดอร์",
+    "Authentication" : "รับรองความถูกต้อง",
     "Configuration" : "การกำหนดค่า",
     "Available for" : "สามารถใช้ได้สำหรับ",
-    "Add storage" : "เพิ่มพื้นที่จัดเก็บข้อมูล",
     "Advanced settings" : "ตั้งค่าขั้นสูง",
     "Delete" : "ลบ",
+    "Add storage" : "เพิ่มพื้นที่จัดเก็บข้อมูล",
     "Enable User External Storage" : "เปิดให้มีการใช้พื้นที่จัดเก็บข้อมูลของผู้ใช้งานจากภายนอกได้",
     "Allow users to mount the following external storage" : "อนุญาตให้ผู้ใช้ติดตั้งจัดเก็บข้อมูลภายนอกต่อไปนี้"
 },
diff --git a/apps/files_external/l10n/th_TH.json b/apps/files_external/l10n/th_TH.json
index 957cc5570c6..cb18b221c4a 100644
--- a/apps/files_external/l10n/th_TH.json
+++ b/apps/files_external/l10n/th_TH.json
@@ -1,57 +1,27 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "ร้องขอโทเค็นล้มเหลว กรุณาตรวจสอบแอพฯคีย์และ Secret ของ Dropbox ของคุณว่าถูกต้องหรือไม่",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "โทเค็นการเข้าถึงล้มเหลว กรุณาตรวจสอบแอพฯคีย์และ Secret ของ Dropbox ของคุณว่าถูกต้องหรือไม่",
-    "Please provide a valid Dropbox app key and secret." : "กรุณากรอกรหัส app key ของ Dropbox และรหัสลับ",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "การเรียกร้องขอโทเคนล้มเหลว โปรดตรวจสอบคีย์และรหัสลับให้ถูกต้อง",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "การเรียกร้องขอโทเคนล้มเหลว โปรดตรวจสอบคีย์และรหัสลับของแอพฯ ให้ถูกต้อง",
+    "Please provide a valid app key and secret." : "โปรดระบุคีย์และรหัสลับของแอพฯ ให้ถูกต้อง",
     "Step 1 failed. Exception: %s" : "ขั้นตอนที่ 1 ล้มเหลว ข้อยกเว้น: %s",
     "Step 2 failed. Exception: %s" : "ขั้นตอนที่ 2 ล้มเหลว ข้อยกเว้น: %s",
     "External storage" : "จัดเก็บข้อมูลภายนอก",
-    "Local" : "ต้นทาง",
-    "Location" : "ตำแหน่งที่อยู่",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "รหัส",
-    "Secret" : "Secret",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 และ Compliant",
-    "Access Key" : "รหัสการเข้าถึง",
-    "Secret Key" : "รหัสลับ",
-    "Hostname" : "ชื่อโฮสต์",
-    "Port" : "พอร์ต",
-    "Region" : "พื้นที่",
-    "Enable SSL" : "เปิดใช้งาน SSL",
-    "Enable Path Style" : "เปิดใช้งานสไตล์เส้นทาง",
-    "App key" : "App key",
-    "App secret" : "App secret",
-    "Host" : "โฮสต์",
-    "Username" : "ชื่อผู้ใช้งาน",
-    "Password" : "รหัสผ่าน",
-    "Remote subfolder" : "โฟลเดอร์ย่อยระยะไกล",
-    "Secure ftps://" : "โหมดปลอดภัย ftps://",
-    "Client ID" : "Client ID",
-    "Client secret" : "Client secret",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "ภูมิภาค (จำเป็นสำหรับ OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (จำเป็นสำหรับ Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "ชื่อผู้เช่า (จำเป็นสำหรับ OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "รหัสผ่าน (ที่จำเป็นสำหรับ OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "ชื่อบริการ (จำเป็นสำหรับ OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "ตัวตนของ URL ปลายทาง (จำเป็นสำหรับ OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "หมดเวลาของการร้องขอ HTTP ในไม่กี่วินาที",
-    "Share" : "แชร์",
-    "SMB / CIFS using OC login" : "SMB/CIFS กำลังใช้ OC เข้าสู่ระบบ",
-    "Username as share" : "ชื่อผู้ใช้ที่แชร์",
-    "URL" : "URL",
-    "Secure https://" : "โหมดปลอดภัย https://",
-    "SFTP with secret key login" : "SFTP กับคีย์ลับสำหรับเข้าสู่ระบบ",
-    "Public key" : "คีย์สาธารณะ",
     "Storage with id \"%i\" not found" : "ไม่พบจัดการเก็บข้อมูลของ ID \"%i\"",
+    "Invalid backend or authentication mechanism class" : "แบ็กเอนด์ไม่ถูกต้องหรือระดับการรับรองความถูกต้องไม่เพียงพอ",
     "Invalid mount point" : "จุดเชื่อมต่อที่ไม่ถูกต้อง",
+    "Objectstore forbidden" : "เก็บวัตถุต้องห้าม",
     "Invalid storage backend \"%s\"" : "การจัดเก็บข้อมูลแบ็กเอนด์ไม่ถูกต้อง \"%s\"",
-    "Access granted" : "การเข้าถึงได้รับอนุญาตแล้ว",
-    "Error configuring Dropbox storage" : "เกิดข้อผิดพลาดในการกำหนดค่าพื้นที่จัดเก็บข้อมูล Dropbox",
-    "Grant access" : "อนุญาตให้เข้าถึงได้",
-    "Error configuring Google Drive storage" : "เกิดข้อผิดพลาดในการกำหนดค่าการจัดเก็บข้อมูลในพื้นที่ของ Google Drive",
+    "Not permitted to use backend \"%s\"" : "ไม่อนุญาตให้ใช้แบ็กเอนด์ \"%s\"",
+    "Not permitted to use authentication mechanism \"%s\"" : "ไม่อนุญาตให้ตรวจสอบการรับรองความถูกต้อง \"%s\"",
+    "Unsatisfied backend parameters" : "พารามิเตอร์แบ็กเอนด์ไม่ได้รับอนุญาต",
+    "Unsatisfied authentication mechanism parameters" : "การรับรองความถูกต้องไม่เพียงพอ",
     "Personal" : "ส่วนตัว",
     "System" : "ระบบ",
+    "Grant access" : "อนุญาตให้เข้าถึงได้",
+    "Access granted" : "การเข้าถึงได้รับอนุญาตแล้ว",
+    "Error configuring OAuth1" : "ข้อผิดพลาดในการกำหนดค่า OAuth1",
+    "Error configuring OAuth2" : "ข้อผิดพลาดในการกำหนดค่า OAuth2",
+    "Generate keys" : "สร้างคีย์",
+    "Error generating key pair" : "ข้อผิดพลาดในการสร้างคีย์แบบเป็นคู่",
     "Enable encryption" : "เปิดใช้งานการเข้ารหัส",
     "Enable previews" : "เปิดใช้งานการแสดงตัวอย่าง",
     "Check for changes" : "ตรวจสอบการเปลี่ยนแปลง",
@@ -61,10 +31,57 @@
     "All users. Type to select user or group." : "ผู้ใช้ทุกคน พิมพ์เพื่อเลือกผู้ใช้หรือกลุ่ม",
     "(group)" : "(กลุ่ม)",
     "Saved" : "บันทึกแล้ว",
-    "Generate keys" : "สร้างคีย์",
-    "Error generating key pair" : "ข้อผิดพลาดในการสร้างคีย์แบบเป็นคู่",
+    "Access key" : "คีย์การเข้าถึง",
+    "Secret key" : "คีย์ลับ",
+    "Builtin" : "ในตัว",
+    "None" : "ไม่มี",
+    "OAuth1" : "OAuth1",
+    "App key" : "App key",
+    "App secret" : "App secret",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "Client ID",
+    "Client secret" : "Client secret",
+    "OpenStack" : "OpenStack",
+    "Username" : "ชื่อผู้ใช้งาน",
+    "Password" : "รหัสผ่าน",
+    "Tenant name" : "ชื่อผู้เช่า",
+    "Identity endpoint URL" : "ตัวตนของ URL ปลายทาง",
+    "Rackspace" : "Rackspace",
+    "API key" : "รหัส API",
+    "Username and password" : "ชื่อผู้ใช้และรหัสผ่าน",
+    "Session credentials" : "ข้อมูลของเซสชั่น",
+    "RSA public key" : "RSA คีย์สาธารณะ",
+    "Public key" : "คีย์สาธารณะ",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "ชื่อโฮสต์",
+    "Port" : "พอร์ต",
+    "Region" : "พื้นที่",
+    "Enable SSL" : "เปิดใช้งาน SSL",
+    "Enable Path Style" : "เปิดใช้งานสไตล์เส้นทาง",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "โฟลเดอร์ย่อยระยะไกล",
+    "Secure https://" : "โหมดปลอดภัย https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "โฮสต์",
+    "Secure ftps://" : "โหมดปลอดภัย ftps://",
+    "Google Drive" : "กูเกิ้ลไดร์ฟ",
+    "Local" : "ต้นทาง",
+    "Location" : "ตำแหน่งที่อยู่",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "รูท",
+    "SFTP with secret key login [DEPRECATED]" : "SFTP กับรหัสลับเข้าสู่ระบบ [ยกเลิก]",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "แชร์",
+    "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS กำลังใช้ OC เข้าสู่ระบบ [ยกเลิก]",
+    "Username as share" : "ชื่อผู้ใช้ที่แชร์",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Service name" : "ชื่อบริการ",
+    "Request timeout (seconds)" : "หมดเวลาการร้องขอ (วินาที)",
     "<b>Note:</b> " : "<b>หมายเหตุ:</b>",
-    "and" : "และ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>หมายเหตุ:</b> การสนับสนุน cURL ใน PHP ไม่ได้เปิดใช้งานหรือติดตั้ง %s เป็นไปไม่ได้ กรุณาขอให้ผู้ดูแลระบบของคุณติดตั้งมัน",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>หมายเหตุ:</b> การสนับสนุน FTP ใน PHP ไม่ได้เปิดใช้งานหรือติดตั้ง %s เป็นไปไม่ได้ กรุณาขอให้ผู้ดูแลระบบของคุณติดตั้งมัน",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>หมายเหตุ:</b> %s ไม่ได้ติดตั้ง การติดตั้ง %s เป็นไปไม่ได้ กรุณาขอให้ผู้ดูแลระบบของคุณติดตั้งมัน",
@@ -75,11 +92,12 @@
     "Scope" : "ขอบเขต",
     "External Storage" : "พื้นทีจัดเก็บข้อมูลจากภายนอก",
     "Folder name" : "ชื่อโฟลเดอร์",
+    "Authentication" : "รับรองความถูกต้อง",
     "Configuration" : "การกำหนดค่า",
     "Available for" : "สามารถใช้ได้สำหรับ",
-    "Add storage" : "เพิ่มพื้นที่จัดเก็บข้อมูล",
     "Advanced settings" : "ตั้งค่าขั้นสูง",
     "Delete" : "ลบ",
+    "Add storage" : "เพิ่มพื้นที่จัดเก็บข้อมูล",
     "Enable User External Storage" : "เปิดให้มีการใช้พื้นที่จัดเก็บข้อมูลของผู้ใช้งานจากภายนอกได้",
     "Allow users to mount the following external storage" : "อนุญาตให้ผู้ใช้ติดตั้งจัดเก็บข้อมูลภายนอกต่อไปนี้"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/files_external/l10n/tr.js b/apps/files_external/l10n/tr.js
index afd80de3b6a..652bc611866 100644
--- a/apps/files_external/l10n/tr.js
+++ b/apps/files_external/l10n/tr.js
@@ -1,59 +1,27 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "İstek belirteçleri alınma işlemi başarısız. Dropbox app anahtarı ve parolasının doğru olduğundan emin olun.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Erişim belirteçleri alınma işlemi başarısız. Dropbox app anahtarı ve parolasının doğru olduğundan emin olun.",
-    "Please provide a valid Dropbox app key and secret." : "Lütfen Dropbox app key ve secret temin ediniz",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Getirme istek jetonları başarısız oldu. Uygulama anahtarınızın ve gizli bilginin doğruluğunu kontrol edin.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Getirme erişim jetonları başarısız oldu. Uygulama anahtarınızın ve gizli bilginin doğruluğunu kontrol edin.",
+    "Please provide a valid app key and secret." : "Lütfen geçerli bir uygulama anahtarı ve gizli bilgisini girin.",
     "Step 1 failed. Exception: %s" : "Adım 1 başarısız. Özel durum: %s",
     "Step 2 failed. Exception: %s" : "Adım 2 başarısız. Özel durum: %s",
     "External storage" : "Harici depolama",
-    "Local" : "Yerel",
-    "Location" : "Konum",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Anahtar",
-    "Secret" : "Parola",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 ve uyumlu olanlar",
-    "Access Key" : "Erişim Anahtarı",
-    "Secret Key" : "Gizli Anahtar",
-    "Hostname" : "Makine adı",
-    "Port" : "Port",
-    "Region" : "Bölge",
-    "Enable SSL" : "SSL'yi Etkinleştir",
-    "Enable Path Style" : "Yol Biçemini Etkinleştir",
-    "App key" : "Uyg. anahtarı",
-    "App secret" : "Uyg. parolası",
-    "Host" : "Sunucu",
-    "Username" : "Kullanıcı Adı",
-    "Password" : "Parola",
-    "Remote subfolder" : "Uzak alt klasör",
-    "Secure ftps://" : "Güvenli ftps://",
-    "Client ID" : "İstemci kimliği",
-    "Client secret" : "İstemci parolası",
-    "OpenStack Object Storage" : "OpenStack Nesne Depolama",
-    "Region (optional for OpenStack Object Storage)" : "Bölge (OpenStack Nesne Depolaması için isteğe bağlı)",
-    "API Key (required for Rackspace Cloud Files)" : "API Anahtarı (Rackspace Bulut Dosyaları için gerekli)",
-    "Tenantname (required for OpenStack Object Storage)" : "Kiracı Adı (OpenStack Nesne Depolaması için gerekli)",
-    "Password (required for OpenStack Object Storage)" : "Parola (OpenStack Nesne Depolaması için gerekli)",
-    "Service Name (required for OpenStack Object Storage)" : "Hizmet Adı (OpenStack Nesne Depolaması için gerekli)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Kimlik uç nokta adresi (OpenStack Nesne Depolaması için gerekli)",
-    "Timeout of HTTP requests in seconds" : "Saniye cinsinden HTTP istek zaman aşımı",
-    "Share" : "Paylaş",
-    "SMB / CIFS using OC login" : "OC oturumu kullanarak SMB / CIFS",
-    "Username as share" : "Paylaşım olarak kullanıcı adı",
-    "URL" : "URL",
-    "Secure https://" : "Güvenli https://",
-    "SFTP with secret key login" : "Gizli anahtar oturumu ile SFTP",
-    "Public key" : "Ortak anahtar",
     "Storage with id \"%i\" not found" : "\"%i\" kimliği ile bir depolama bulunamadı",
+    "Invalid backend or authentication mechanism class" : "Geçersiz arkauç veya kimlik doğrulama mekanizma sınıfı",
     "Invalid mount point" : "Geçersiz bağlama noktası",
+    "Objectstore forbidden" : "Nesne deposu yasaktır",
     "Invalid storage backend \"%s\"" : "Geçersiz depolama arka ucu \"%s\"",
-    "Access granted" : "Giriş kabul edildi",
-    "Error configuring Dropbox storage" : "Dropbox depo yapılandırma hatası",
-    "Grant access" : "Erişimi sağla",
-    "Error configuring Google Drive storage" : "Google Drive depo yapılandırma hatası",
+    "Unsatisfied backend parameters" : "Yetersiz arkauç parametreleri",
+    "Unsatisfied authentication mechanism parameters" : "Yetersiz kimlik doğrulama mekanizması parametreleri",
     "Personal" : "Kişisel",
     "System" : "Sistem",
+    "Grant access" : "Erişimi sağla",
+    "Access granted" : "Giriş kabul edildi",
+    "Error configuring OAuth1" : "OAuth1 yapılandırma hatası",
+    "Error configuring OAuth2" : "OAuth2 yapılandırma hatası",
+    "Generate keys" : "Anahtarlar üret",
+    "Error generating key pair" : "Anahtar çifti üretirken hata",
     "Enable encryption" : "Şifrelemeyi aç",
     "Enable previews" : "Önizlemeleri aç",
     "Check for changes" : "Değişiklikleri denetle",
@@ -63,10 +31,48 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Tüm kullanıcılar. Kullanıcı veya grup seçmek için yazın.",
     "(group)" : "(grup)",
     "Saved" : "Kaydedildi",
-    "Generate keys" : "Anahtarlar üret",
-    "Error generating key pair" : "Anahtar çifti üretirken hata",
+    "Access key" : "Erişim anahtarı",
+    "Secret key" : "Gizli anahtar",
+    "Builtin" : "Yerleşik",
+    "None" : "Hiçbiri",
+    "OAuth1" : "OAuth1",
+    "App key" : "Uyg. anahtarı",
+    "App secret" : "Uyg. parolası",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "İstemci kimliği",
+    "Client secret" : "İstemci parolası",
+    "Username" : "Kullanıcı Adı",
+    "Password" : "Parola",
+    "API key" : "API anahtarı",
+    "Username and password" : "Kullanıcı adı ve parola",
+    "Session credentials" : "Oturum bilgileri",
+    "Public key" : "Ortak anahtar",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Makine adı",
+    "Port" : "Port",
+    "Region" : "Bölge",
+    "Enable SSL" : "SSL'yi Etkinleştir",
+    "Enable Path Style" : "Yol Biçemini Etkinleştir",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Uzak alt klasör",
+    "Secure https://" : "Güvenli https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Sunucu",
+    "Secure ftps://" : "Güvenli ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Yerel",
+    "Location" : "Konum",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Kök",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Paylaş",
+    "Username as share" : "Paylaşım olarak kullanıcı adı",
+    "OpenStack Object Storage" : "OpenStack Nesne Depolama",
     "<b>Note:</b> " : "<b>Not:</b> ",
-    "and" : "ve",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Not:</b> PHP'de cURL desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Not:</b> PHP'de FTP desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Not:</b> \"%s\" kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.",
@@ -77,11 +83,12 @@ OC.L10N.register(
     "Scope" : "Kapsam",
     "External Storage" : "Harici Depolama",
     "Folder name" : "Klasör ismi",
+    "Authentication" : "Kimlik Doğrulama",
     "Configuration" : "Yapılandırma",
     "Available for" : "Kullanabilenler",
-    "Add storage" : "Depo ekle",
     "Advanced settings" : "Gelişmiş ayarlar",
     "Delete" : "Sil",
+    "Add storage" : "Depo ekle",
     "Enable User External Storage" : "Kullanıcılar için Harici Depolamayı Etkinleştir",
     "Allow users to mount the following external storage" : "Kullanıcıların aşağıdaki harici depolamayı bağlamalarına izin ver"
 },
diff --git a/apps/files_external/l10n/tr.json b/apps/files_external/l10n/tr.json
index 07fa89651d2..328ecab466f 100644
--- a/apps/files_external/l10n/tr.json
+++ b/apps/files_external/l10n/tr.json
@@ -1,57 +1,25 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "İstek belirteçleri alınma işlemi başarısız. Dropbox app anahtarı ve parolasının doğru olduğundan emin olun.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Erişim belirteçleri alınma işlemi başarısız. Dropbox app anahtarı ve parolasının doğru olduğundan emin olun.",
-    "Please provide a valid Dropbox app key and secret." : "Lütfen Dropbox app key ve secret temin ediniz",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Getirme istek jetonları başarısız oldu. Uygulama anahtarınızın ve gizli bilginin doğruluğunu kontrol edin.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Getirme erişim jetonları başarısız oldu. Uygulama anahtarınızın ve gizli bilginin doğruluğunu kontrol edin.",
+    "Please provide a valid app key and secret." : "Lütfen geçerli bir uygulama anahtarı ve gizli bilgisini girin.",
     "Step 1 failed. Exception: %s" : "Adım 1 başarısız. Özel durum: %s",
     "Step 2 failed. Exception: %s" : "Adım 2 başarısız. Özel durum: %s",
     "External storage" : "Harici depolama",
-    "Local" : "Yerel",
-    "Location" : "Konum",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Anahtar",
-    "Secret" : "Parola",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 ve uyumlu olanlar",
-    "Access Key" : "Erişim Anahtarı",
-    "Secret Key" : "Gizli Anahtar",
-    "Hostname" : "Makine adı",
-    "Port" : "Port",
-    "Region" : "Bölge",
-    "Enable SSL" : "SSL'yi Etkinleştir",
-    "Enable Path Style" : "Yol Biçemini Etkinleştir",
-    "App key" : "Uyg. anahtarı",
-    "App secret" : "Uyg. parolası",
-    "Host" : "Sunucu",
-    "Username" : "Kullanıcı Adı",
-    "Password" : "Parola",
-    "Remote subfolder" : "Uzak alt klasör",
-    "Secure ftps://" : "Güvenli ftps://",
-    "Client ID" : "İstemci kimliği",
-    "Client secret" : "İstemci parolası",
-    "OpenStack Object Storage" : "OpenStack Nesne Depolama",
-    "Region (optional for OpenStack Object Storage)" : "Bölge (OpenStack Nesne Depolaması için isteğe bağlı)",
-    "API Key (required for Rackspace Cloud Files)" : "API Anahtarı (Rackspace Bulut Dosyaları için gerekli)",
-    "Tenantname (required for OpenStack Object Storage)" : "Kiracı Adı (OpenStack Nesne Depolaması için gerekli)",
-    "Password (required for OpenStack Object Storage)" : "Parola (OpenStack Nesne Depolaması için gerekli)",
-    "Service Name (required for OpenStack Object Storage)" : "Hizmet Adı (OpenStack Nesne Depolaması için gerekli)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Kimlik uç nokta adresi (OpenStack Nesne Depolaması için gerekli)",
-    "Timeout of HTTP requests in seconds" : "Saniye cinsinden HTTP istek zaman aşımı",
-    "Share" : "Paylaş",
-    "SMB / CIFS using OC login" : "OC oturumu kullanarak SMB / CIFS",
-    "Username as share" : "Paylaşım olarak kullanıcı adı",
-    "URL" : "URL",
-    "Secure https://" : "Güvenli https://",
-    "SFTP with secret key login" : "Gizli anahtar oturumu ile SFTP",
-    "Public key" : "Ortak anahtar",
     "Storage with id \"%i\" not found" : "\"%i\" kimliği ile bir depolama bulunamadı",
+    "Invalid backend or authentication mechanism class" : "Geçersiz arkauç veya kimlik doğrulama mekanizma sınıfı",
     "Invalid mount point" : "Geçersiz bağlama noktası",
+    "Objectstore forbidden" : "Nesne deposu yasaktır",
     "Invalid storage backend \"%s\"" : "Geçersiz depolama arka ucu \"%s\"",
-    "Access granted" : "Giriş kabul edildi",
-    "Error configuring Dropbox storage" : "Dropbox depo yapılandırma hatası",
-    "Grant access" : "Erişimi sağla",
-    "Error configuring Google Drive storage" : "Google Drive depo yapılandırma hatası",
+    "Unsatisfied backend parameters" : "Yetersiz arkauç parametreleri",
+    "Unsatisfied authentication mechanism parameters" : "Yetersiz kimlik doğrulama mekanizması parametreleri",
     "Personal" : "Kişisel",
     "System" : "Sistem",
+    "Grant access" : "Erişimi sağla",
+    "Access granted" : "Giriş kabul edildi",
+    "Error configuring OAuth1" : "OAuth1 yapılandırma hatası",
+    "Error configuring OAuth2" : "OAuth2 yapılandırma hatası",
+    "Generate keys" : "Anahtarlar üret",
+    "Error generating key pair" : "Anahtar çifti üretirken hata",
     "Enable encryption" : "Şifrelemeyi aç",
     "Enable previews" : "Önizlemeleri aç",
     "Check for changes" : "Değişiklikleri denetle",
@@ -61,10 +29,48 @@
     "All users. Type to select user or group." : "Tüm kullanıcılar. Kullanıcı veya grup seçmek için yazın.",
     "(group)" : "(grup)",
     "Saved" : "Kaydedildi",
-    "Generate keys" : "Anahtarlar üret",
-    "Error generating key pair" : "Anahtar çifti üretirken hata",
+    "Access key" : "Erişim anahtarı",
+    "Secret key" : "Gizli anahtar",
+    "Builtin" : "Yerleşik",
+    "None" : "Hiçbiri",
+    "OAuth1" : "OAuth1",
+    "App key" : "Uyg. anahtarı",
+    "App secret" : "Uyg. parolası",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "İstemci kimliği",
+    "Client secret" : "İstemci parolası",
+    "Username" : "Kullanıcı Adı",
+    "Password" : "Parola",
+    "API key" : "API anahtarı",
+    "Username and password" : "Kullanıcı adı ve parola",
+    "Session credentials" : "Oturum bilgileri",
+    "Public key" : "Ortak anahtar",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Makine adı",
+    "Port" : "Port",
+    "Region" : "Bölge",
+    "Enable SSL" : "SSL'yi Etkinleştir",
+    "Enable Path Style" : "Yol Biçemini Etkinleştir",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Uzak alt klasör",
+    "Secure https://" : "Güvenli https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Sunucu",
+    "Secure ftps://" : "Güvenli ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Yerel",
+    "Location" : "Konum",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Kök",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Paylaş",
+    "Username as share" : "Paylaşım olarak kullanıcı adı",
+    "OpenStack Object Storage" : "OpenStack Nesne Depolama",
     "<b>Note:</b> " : "<b>Not:</b> ",
-    "and" : "ve",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Not:</b> PHP'de cURL desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Not:</b> PHP'de FTP desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Not:</b> \"%s\" kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.",
@@ -75,11 +81,12 @@
     "Scope" : "Kapsam",
     "External Storage" : "Harici Depolama",
     "Folder name" : "Klasör ismi",
+    "Authentication" : "Kimlik Doğrulama",
     "Configuration" : "Yapılandırma",
     "Available for" : "Kullanabilenler",
-    "Add storage" : "Depo ekle",
     "Advanced settings" : "Gelişmiş ayarlar",
     "Delete" : "Sil",
+    "Add storage" : "Depo ekle",
     "Enable User External Storage" : "Kullanıcılar için Harici Depolamayı Etkinleştir",
     "Allow users to mount the following external storage" : "Kullanıcıların aşağıdaki harici depolamayı bağlamalarına izin ver"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
diff --git a/apps/files_external/l10n/ug.js b/apps/files_external/l10n/ug.js
index a1a5dc648bc..37adb851973 100644
--- a/apps/files_external/l10n/ug.js
+++ b/apps/files_external/l10n/ug.js
@@ -2,14 +2,17 @@ OC.L10N.register(
     "files_external",
     {
     "External storage" : "سىرتقى ساقلىغۇچ",
-    "Location" : "ئورنى",
-    "Port" : "ئېغىز",
-    "Host" : "باش ئاپپارات",
+    "Personal" : "شەخسىي",
+    "None" : "يوق",
     "Username" : "ئىشلەتكۈچى ئاتى",
     "Password" : "ئىم",
-    "Share" : "ھەمبەھىر",
+    "Port" : "ئېغىز",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
-    "Personal" : "شەخسىي",
+    "Host" : "باش ئاپپارات",
+    "Location" : "ئورنى",
+    "ownCloud" : "ownCloud",
+    "Share" : "ھەمبەھىر",
     "Name" : "ئاتى",
     "Folder name" : "قىسقۇچ ئاتى",
     "Configuration" : "سەپلىمە",
diff --git a/apps/files_external/l10n/ug.json b/apps/files_external/l10n/ug.json
index d6923a86599..f7a072bfe38 100644
--- a/apps/files_external/l10n/ug.json
+++ b/apps/files_external/l10n/ug.json
@@ -1,13 +1,16 @@
 { "translations": {
     "External storage" : "سىرتقى ساقلىغۇچ",
-    "Location" : "ئورنى",
-    "Port" : "ئېغىز",
-    "Host" : "باش ئاپپارات",
+    "Personal" : "شەخسىي",
+    "None" : "يوق",
     "Username" : "ئىشلەتكۈچى ئاتى",
     "Password" : "ئىم",
-    "Share" : "ھەمبەھىر",
+    "Port" : "ئېغىز",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
-    "Personal" : "شەخسىي",
+    "Host" : "باش ئاپپارات",
+    "Location" : "ئورنى",
+    "ownCloud" : "ownCloud",
+    "Share" : "ھەمبەھىر",
     "Name" : "ئاتى",
     "Folder name" : "قىسقۇچ ئاتى",
     "Configuration" : "سەپلىمە",
diff --git a/apps/files_external/l10n/uk.js b/apps/files_external/l10n/uk.js
index 6e061a0526b..024d4fcf982 100644
--- a/apps/files_external/l10n/uk.js
+++ b/apps/files_external/l10n/uk.js
@@ -1,66 +1,53 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Помилка при отримані токенів. Перевірте правильність вашого секретного ключа та ключ додатка.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Помилка при отримані токена доступу. Перевірте правильність вашого секретного ключа та ключ додатка.",
-    "Please provide a valid Dropbox app key and secret." : "Будь ласка, надайте дійсний ключ та пароль Dropbox.",
     "Step 1 failed. Exception: %s" : "1-й крок невдалий. Виключення: %s",
     "Step 2 failed. Exception: %s" : "2-й крок невдалий. Виключення: %s",
     "External storage" : "Зовнішнє сховище",
-    "Local" : "Локально",
-    "Location" : "Місце",
+    "Storage with id \"%i\" not found" : "Сховище з id \"%i\" не знайдено",
+    "Invalid mount point" : "Невірна точка монтування",
+    "Invalid storage backend \"%s\"" : "Невірне сховище \"%s\"",
+    "Personal" : "Особисте",
+    "System" : "Система",
+    "Grant access" : "Дозволити доступ",
+    "Access granted" : "Доступ дозволено",
+    "Generate keys" : "Створити ключі",
+    "Error generating key pair" : "Помилка створення ключової пари",
+    "Enable encryption" : "Увімкнути шифрування",
+    "All users. Type to select user or group." : "Всі користувачі. Введіть ім'я користувача або групи.",
+    "(group)" : "(група)",
+    "Saved" : "Збережено",
+    "None" : "Жоден",
+    "App key" : "Ключ додатку",
+    "App secret" : "Секретний ключ додатку",
+    "Client ID" : "Ідентифікатор клієнта",
+    "Client secret" : "Ключ клієнта",
+    "Username" : "Ім'я користувача",
+    "Password" : "Пароль",
+    "API key" : "ключ API",
+    "Public key" : "Відкритий ключ",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Ключ",
-    "Secret" : "Секрет",
     "Bucket" : "Кошик",
-    "Amazon S3 and compliant" : "Amazon S3 та сумісний",
-    "Access Key" : "Ключ доступу",
-    "Secret Key" : "Секретний ключ",
     "Hostname" : "Ім'я хоста",
     "Port" : "Порт",
     "Region" : "Регіон",
     "Enable SSL" : "Включити SSL",
     "Enable Path Style" : "Включити стиль шляху",
-    "App key" : "Ключ додатку",
-    "App secret" : "Секретний ключ додатку",
-    "Host" : "Хост",
-    "Username" : "Ім'я користувача",
-    "Password" : "Пароль",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Remote subfolder" : "Віддалений підкаталог",
+    "Secure https://" : "Захищений https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Хост",
     "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 запитів на секунду",
+    "Local" : "Локально",
+    "Location" : "Місце",
+    "ownCloud" : "ownCloud",
+    "Root" : "Батьківський каталог",
     "Share" : "Поділитися",
-    "SMB / CIFS using OC login" : "SMB / CIFS з використанням логіна OC",
     "Username as share" : "Ім'я для відкритого доступу",
-    "URL" : "URL",
-    "Secure https://" : "Захищений https://",
-    "Public key" : "Відкритий ключ",
-    "Storage with id \"%i\" not found" : "Сховище з id \"%i\" не знайдено",
-    "Invalid mount point" : "Невірна точка монтування",
-    "Invalid storage backend \"%s\"" : "Невірне сховище \"%s\"",
-    "Access granted" : "Доступ дозволено",
-    "Error configuring Dropbox storage" : "Помилка при налаштуванні сховища Dropbox",
-    "Grant access" : "Дозволити доступ",
-    "Error configuring Google Drive storage" : "Помилка при налаштуванні сховища Google Drive",
-    "Personal" : "Особисте",
-    "System" : "Система",
-    "Enable encryption" : "Увімкнути шифрування",
-    "All users. Type to select user or group." : "Всі користувачі. Введіть ім'я користувача або групи.",
-    "(group)" : "(група)",
-    "Saved" : "Збережено",
-    "Generate keys" : "Створити ключі",
-    "Error generating key pair" : "Помилка створення ключової пари",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Примітка:</b>",
-    "and" : "і",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примітка:</b> Підтримку cURL в PHP не ввімкнено чи не встановлена. Під'єднатися до %s неможливо. Зверніться до системного адміністратора.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примітка:</b> Підтримку FTP в PHP не ввімкнено чи не встановлена. Під'єднатися до %s неможливо. Зверніться до системного адміністратора.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примітка:</b> \"%s\" не встановлено. Під'єднатися до %s неможливо. Зверніться до системного адміністратора.",
@@ -73,9 +60,9 @@ OC.L10N.register(
     "Folder name" : "Ім'я теки",
     "Configuration" : "Налаштування",
     "Available for" : "Доступний для",
-    "Add storage" : "Додати сховище",
     "Advanced settings" : "Розширені налаштування",
     "Delete" : "Видалити",
+    "Add storage" : "Додати сховище",
     "Enable User External Storage" : "Активувати користувацькі зовнішні сховища",
     "Allow users to mount the following external storage" : "Дозволити користувачам монтувати наступні зовнішні сховища"
 },
diff --git a/apps/files_external/l10n/uk.json b/apps/files_external/l10n/uk.json
index bb7c337595b..fe5c43a8f39 100644
--- a/apps/files_external/l10n/uk.json
+++ b/apps/files_external/l10n/uk.json
@@ -1,64 +1,51 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Помилка при отримані токенів. Перевірте правильність вашого секретного ключа та ключ додатка.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Помилка при отримані токена доступу. Перевірте правильність вашого секретного ключа та ключ додатка.",
-    "Please provide a valid Dropbox app key and secret." : "Будь ласка, надайте дійсний ключ та пароль Dropbox.",
     "Step 1 failed. Exception: %s" : "1-й крок невдалий. Виключення: %s",
     "Step 2 failed. Exception: %s" : "2-й крок невдалий. Виключення: %s",
     "External storage" : "Зовнішнє сховище",
-    "Local" : "Локально",
-    "Location" : "Місце",
+    "Storage with id \"%i\" not found" : "Сховище з id \"%i\" не знайдено",
+    "Invalid mount point" : "Невірна точка монтування",
+    "Invalid storage backend \"%s\"" : "Невірне сховище \"%s\"",
+    "Personal" : "Особисте",
+    "System" : "Система",
+    "Grant access" : "Дозволити доступ",
+    "Access granted" : "Доступ дозволено",
+    "Generate keys" : "Створити ключі",
+    "Error generating key pair" : "Помилка створення ключової пари",
+    "Enable encryption" : "Увімкнути шифрування",
+    "All users. Type to select user or group." : "Всі користувачі. Введіть ім'я користувача або групи.",
+    "(group)" : "(група)",
+    "Saved" : "Збережено",
+    "None" : "Жоден",
+    "App key" : "Ключ додатку",
+    "App secret" : "Секретний ключ додатку",
+    "Client ID" : "Ідентифікатор клієнта",
+    "Client secret" : "Ключ клієнта",
+    "Username" : "Ім'я користувача",
+    "Password" : "Пароль",
+    "API key" : "ключ API",
+    "Public key" : "Відкритий ключ",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Ключ",
-    "Secret" : "Секрет",
     "Bucket" : "Кошик",
-    "Amazon S3 and compliant" : "Amazon S3 та сумісний",
-    "Access Key" : "Ключ доступу",
-    "Secret Key" : "Секретний ключ",
     "Hostname" : "Ім'я хоста",
     "Port" : "Порт",
     "Region" : "Регіон",
     "Enable SSL" : "Включити SSL",
     "Enable Path Style" : "Включити стиль шляху",
-    "App key" : "Ключ додатку",
-    "App secret" : "Секретний ключ додатку",
-    "Host" : "Хост",
-    "Username" : "Ім'я користувача",
-    "Password" : "Пароль",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Remote subfolder" : "Віддалений підкаталог",
+    "Secure https://" : "Захищений https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Хост",
     "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 запитів на секунду",
+    "Local" : "Локально",
+    "Location" : "Місце",
+    "ownCloud" : "ownCloud",
+    "Root" : "Батьківський каталог",
     "Share" : "Поділитися",
-    "SMB / CIFS using OC login" : "SMB / CIFS з використанням логіна OC",
     "Username as share" : "Ім'я для відкритого доступу",
-    "URL" : "URL",
-    "Secure https://" : "Захищений https://",
-    "Public key" : "Відкритий ключ",
-    "Storage with id \"%i\" not found" : "Сховище з id \"%i\" не знайдено",
-    "Invalid mount point" : "Невірна точка монтування",
-    "Invalid storage backend \"%s\"" : "Невірне сховище \"%s\"",
-    "Access granted" : "Доступ дозволено",
-    "Error configuring Dropbox storage" : "Помилка при налаштуванні сховища Dropbox",
-    "Grant access" : "Дозволити доступ",
-    "Error configuring Google Drive storage" : "Помилка при налаштуванні сховища Google Drive",
-    "Personal" : "Особисте",
-    "System" : "Система",
-    "Enable encryption" : "Увімкнути шифрування",
-    "All users. Type to select user or group." : "Всі користувачі. Введіть ім'я користувача або групи.",
-    "(group)" : "(група)",
-    "Saved" : "Збережено",
-    "Generate keys" : "Створити ключі",
-    "Error generating key pair" : "Помилка створення ключової пари",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Примітка:</b>",
-    "and" : "і",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примітка:</b> Підтримку cURL в PHP не ввімкнено чи не встановлена. Під'єднатися до %s неможливо. Зверніться до системного адміністратора.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примітка:</b> Підтримку FTP в PHP не ввімкнено чи не встановлена. Під'єднатися до %s неможливо. Зверніться до системного адміністратора.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примітка:</b> \"%s\" не встановлено. Під'єднатися до %s неможливо. Зверніться до системного адміністратора.",
@@ -71,9 +58,9 @@
     "Folder name" : "Ім'я теки",
     "Configuration" : "Налаштування",
     "Available for" : "Доступний для",
-    "Add storage" : "Додати сховище",
     "Advanced settings" : "Розширені налаштування",
     "Delete" : "Видалити",
+    "Add storage" : "Додати сховище",
     "Enable User External Storage" : "Активувати користувацькі зовнішні сховища",
     "Allow users to mount the following external storage" : "Дозволити користувачам монтувати наступні зовнішні сховища"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
diff --git a/apps/files_external/l10n/ur_PK.js b/apps/files_external/l10n/ur_PK.js
index 19554608096..55c8ee1f1bc 100644
--- a/apps/files_external/l10n/ur_PK.js
+++ b/apps/files_external/l10n/ur_PK.js
@@ -1,12 +1,12 @@
 OC.L10N.register(
     "files_external",
     {
-    "Location" : "مقام",
+    "Personal" : "شخصی",
     "Username" : "یوزر نیم",
     "Password" : "پاسورڈ",
-    "Share" : "تقسیم",
     "URL" : "یو ار ایل",
-    "Personal" : "شخصی",
+    "Location" : "مقام",
+    "Share" : "تقسیم",
     "Name" : "اسم",
     "Delete" : "حذف کریں"
 },
diff --git a/apps/files_external/l10n/ur_PK.json b/apps/files_external/l10n/ur_PK.json
index c4df8947bd7..e8b9c79e1f1 100644
--- a/apps/files_external/l10n/ur_PK.json
+++ b/apps/files_external/l10n/ur_PK.json
@@ -1,10 +1,10 @@
 { "translations": {
-    "Location" : "مقام",
+    "Personal" : "شخصی",
     "Username" : "یوزر نیم",
     "Password" : "پاسورڈ",
-    "Share" : "تقسیم",
     "URL" : "یو ار ایل",
-    "Personal" : "شخصی",
+    "Location" : "مقام",
+    "Share" : "تقسیم",
     "Name" : "اسم",
     "Delete" : "حذف کریں"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/vi.js b/apps/files_external/l10n/vi.js
index 9c9405ba2b0..49c746851eb 100644
--- a/apps/files_external/l10n/vi.js
+++ b/apps/files_external/l10n/vi.js
@@ -1,30 +1,28 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Yêu cầu tokens thất bại. Xác minh key và mã bí mật ứng dụng Dropbox của bạn là chính xác.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Yêu cầu tokens thất bại. Xác minh key và mã bí mật ứng dụng Dropbox của bạn là chính xác.",
-    "Please provide a valid Dropbox app key and secret." : "Xin vui lòng cung cấp một ứng dụng Dropbox hợp lệ và mã bí mật.",
     "External storage" : "Lưu trữ ngoài",
-    "Location" : "Vị trí",
+    "Personal" : "Cá nhân",
+    "Grant access" : "Cấp quyền truy cập",
+    "Access granted" : "Đã cấp quyền truy cập",
+    "Saved" : "Đã lưu",
+    "None" : "Không gì cả",
+    "Username" : "Tên đăng nhập",
+    "Password" : "Mật khẩu",
     "Port" : "Cổng",
     "Region" : "Vùng/miền",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Host" : "Máy chủ",
-    "Username" : "Tên đăng nhập",
-    "Password" : "Mật khẩu",
+    "Location" : "Vị trí",
+    "ownCloud" : "ownCloud",
     "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",
-    "Saved" : "Đã lưu",
     "Name" : "Tên",
     "External Storage" : "Lưu trữ ngoài",
     "Folder name" : "Tên thư mục",
     "Configuration" : "Cấu hình",
-    "Add storage" : "Thêm bộ nhớ",
     "Delete" : "Xóa",
+    "Add storage" : "Thêm bộ nhớ",
     "Enable User External Storage" : "Kích hoạt tính năng lưu trữ ngoài"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files_external/l10n/vi.json b/apps/files_external/l10n/vi.json
index fa45495d07b..4daddc7ae57 100644
--- a/apps/files_external/l10n/vi.json
+++ b/apps/files_external/l10n/vi.json
@@ -1,28 +1,26 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Yêu cầu tokens thất bại. Xác minh key và mã bí mật ứng dụng Dropbox của bạn là chính xác.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Yêu cầu tokens thất bại. Xác minh key và mã bí mật ứng dụng Dropbox của bạn là chính xác.",
-    "Please provide a valid Dropbox app key and secret." : "Xin vui lòng cung cấp một ứng dụng Dropbox hợp lệ và mã bí mật.",
     "External storage" : "Lưu trữ ngoài",
-    "Location" : "Vị trí",
+    "Personal" : "Cá nhân",
+    "Grant access" : "Cấp quyền truy cập",
+    "Access granted" : "Đã cấp quyền truy cập",
+    "Saved" : "Đã lưu",
+    "None" : "Không gì cả",
+    "Username" : "Tên đăng nhập",
+    "Password" : "Mật khẩu",
     "Port" : "Cổng",
     "Region" : "Vùng/miền",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Host" : "Máy chủ",
-    "Username" : "Tên đăng nhập",
-    "Password" : "Mật khẩu",
+    "Location" : "Vị trí",
+    "ownCloud" : "ownCloud",
     "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",
-    "Saved" : "Đã lưu",
     "Name" : "Tên",
     "External Storage" : "Lưu trữ ngoài",
     "Folder name" : "Tên thư mục",
     "Configuration" : "Cấu hình",
-    "Add storage" : "Thêm bộ nhớ",
     "Delete" : "Xóa",
+    "Add storage" : "Thêm bộ nhớ",
     "Enable User External Storage" : "Kích hoạt tính năng lưu trữ ngoài"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/zh_CN.js b/apps/files_external/l10n/zh_CN.js
index 0b2731fd911..535d945b028 100644
--- a/apps/files_external/l10n/zh_CN.js
+++ b/apps/files_external/l10n/zh_CN.js
@@ -1,38 +1,36 @@
 OC.L10N.register(
     "files_external",
     {
-    "Please provide a valid Dropbox app key and secret." : "请提供有效的Dropbox应用key和secret",
     "Step 1 failed. Exception: %s" : "步骤 1 失败。异常：%s",
     "Step 2 failed. Exception: %s" : "步骤 2 失败。异常：%s",
     "External storage" : "外部存储",
-    "Local" : "本地",
-    "Location" : "地点",
+    "Personal" : "个人",
+    "System" : "系统",
+    "Grant access" : "授权",
+    "Access granted" : "权限已授予。",
+    "Enable encryption" : "启用加密",
+    "Saved" : "已保存",
+    "None" : "无",
+    "Username" : "用户名",
+    "Password" : "密码",
+    "API key" : "API密匙",
     "Amazon S3" : "Amazon S3",
-    "Amazon S3 and compliant" : "Amazon S3 和兼容协议",
-    "Access Key" : "访问密钥",
-    "Secret Key" : "秘钥",
     "Port" : "端口",
     "Region" : "地区",
     "Enable SSL" : "启用 SSL",
     "Enable Path Style" : "启用 Path Style",
-    "Host" : "主机",
-    "Username" : "用户名",
-    "Password" : "密码",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Remote subfolder" : "远程子文件夹",
+    "Secure https://" : "安全 https://",
+    "Host" : "主机",
     "Secure ftps://" : "安全 ftps://",
-    "OpenStack Object Storage" : "OpenStack 对象存储",
+    "Local" : "本地",
+    "Location" : "地点",
+    "ownCloud" : "ownCloud",
+    "Root" : "根路径",
     "Share" : "共享",
-    "SMB / CIFS using OC login" : "SMB / CIFS 使用 OC 登录信息",
-    "URL" : "URL",
-    "Secure https://" : "安全 https://",
-    "Access granted" : "权限已授予。",
-    "Error configuring Dropbox storage" : "配置Dropbox存储时出错",
-    "Grant access" : "授权",
-    "Error configuring Google Drive storage" : "配置Google Drive存储时出错",
-    "Personal" : "个人",
-    "System" : "系统",
-    "Enable encryption" : "启用加密",
-    "Saved" : "已保存",
+    "OpenStack Object Storage" : "OpenStack 对象存储",
     "<b>Note:</b> " : "<b>注意：</b>",
     "Name" : "名称",
     "Storage type" : "存储类型",
@@ -41,8 +39,8 @@ OC.L10N.register(
     "Folder name" : "目录名称",
     "Configuration" : "配置",
     "Available for" : "可用于",
-    "Add storage" : "增加存储",
     "Delete" : "删除",
+    "Add storage" : "增加存储",
     "Enable User External Storage" : "启用用户外部存储",
     "Allow users to mount the following external storage" : "允许用户挂载以下外部存储"
 },
diff --git a/apps/files_external/l10n/zh_CN.json b/apps/files_external/l10n/zh_CN.json
index 6d842332264..ac75d680c7e 100644
--- a/apps/files_external/l10n/zh_CN.json
+++ b/apps/files_external/l10n/zh_CN.json
@@ -1,36 +1,34 @@
 { "translations": {
-    "Please provide a valid Dropbox app key and secret." : "请提供有效的Dropbox应用key和secret",
     "Step 1 failed. Exception: %s" : "步骤 1 失败。异常：%s",
     "Step 2 failed. Exception: %s" : "步骤 2 失败。异常：%s",
     "External storage" : "外部存储",
-    "Local" : "本地",
-    "Location" : "地点",
+    "Personal" : "个人",
+    "System" : "系统",
+    "Grant access" : "授权",
+    "Access granted" : "权限已授予。",
+    "Enable encryption" : "启用加密",
+    "Saved" : "已保存",
+    "None" : "无",
+    "Username" : "用户名",
+    "Password" : "密码",
+    "API key" : "API密匙",
     "Amazon S3" : "Amazon S3",
-    "Amazon S3 and compliant" : "Amazon S3 和兼容协议",
-    "Access Key" : "访问密钥",
-    "Secret Key" : "秘钥",
     "Port" : "端口",
     "Region" : "地区",
     "Enable SSL" : "启用 SSL",
     "Enable Path Style" : "启用 Path Style",
-    "Host" : "主机",
-    "Username" : "用户名",
-    "Password" : "密码",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Remote subfolder" : "远程子文件夹",
+    "Secure https://" : "安全 https://",
+    "Host" : "主机",
     "Secure ftps://" : "安全 ftps://",
-    "OpenStack Object Storage" : "OpenStack 对象存储",
+    "Local" : "本地",
+    "Location" : "地点",
+    "ownCloud" : "ownCloud",
+    "Root" : "根路径",
     "Share" : "共享",
-    "SMB / CIFS using OC login" : "SMB / CIFS 使用 OC 登录信息",
-    "URL" : "URL",
-    "Secure https://" : "安全 https://",
-    "Access granted" : "权限已授予。",
-    "Error configuring Dropbox storage" : "配置Dropbox存储时出错",
-    "Grant access" : "授权",
-    "Error configuring Google Drive storage" : "配置Google Drive存储时出错",
-    "Personal" : "个人",
-    "System" : "系统",
-    "Enable encryption" : "启用加密",
-    "Saved" : "已保存",
+    "OpenStack Object Storage" : "OpenStack 对象存储",
     "<b>Note:</b> " : "<b>注意：</b>",
     "Name" : "名称",
     "Storage type" : "存储类型",
@@ -39,8 +37,8 @@
     "Folder name" : "目录名称",
     "Configuration" : "配置",
     "Available for" : "可用于",
-    "Add storage" : "增加存储",
     "Delete" : "删除",
+    "Add storage" : "增加存储",
     "Enable User External Storage" : "启用用户外部存储",
     "Allow users to mount the following external storage" : "允许用户挂载以下外部存储"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/files_external/l10n/zh_HK.js b/apps/files_external/l10n/zh_HK.js
index 9ad4b8a7bce..7a38dd7ffed 100644
--- a/apps/files_external/l10n/zh_HK.js
+++ b/apps/files_external/l10n/zh_HK.js
@@ -1,14 +1,16 @@
 OC.L10N.register(
     "files_external",
     {
-    "Port" : "連接埠",
-    "Host" : "主機",
+    "Personal" : "個人",
+    "Saved" : "已儲存",
+    "None" : "空",
     "Username" : "用戶名稱",
     "Password" : "密碼",
-    "Share" : "分享",
+    "Port" : "連接埠",
+    "WebDAV" : "WebDAV",
     "URL" : "網址",
-    "Personal" : "個人",
-    "Saved" : "已儲存",
+    "Host" : "主機",
+    "Share" : "分享",
     "Name" : "名稱",
     "Folder name" : "資料夾名稱",
     "Delete" : "刪除"
diff --git a/apps/files_external/l10n/zh_HK.json b/apps/files_external/l10n/zh_HK.json
index 955170d618f..befeede4bbe 100644
--- a/apps/files_external/l10n/zh_HK.json
+++ b/apps/files_external/l10n/zh_HK.json
@@ -1,12 +1,14 @@
 { "translations": {
-    "Port" : "連接埠",
-    "Host" : "主機",
+    "Personal" : "個人",
+    "Saved" : "已儲存",
+    "None" : "空",
     "Username" : "用戶名稱",
     "Password" : "密碼",
-    "Share" : "分享",
+    "Port" : "連接埠",
+    "WebDAV" : "WebDAV",
     "URL" : "網址",
-    "Personal" : "個人",
-    "Saved" : "已儲存",
+    "Host" : "主機",
+    "Share" : "分享",
     "Name" : "名稱",
     "Folder name" : "資料夾名稱",
     "Delete" : "刪除"
diff --git a/apps/files_external/l10n/zh_TW.js b/apps/files_external/l10n/zh_TW.js
index 22c213ad5cc..e4e01cd2d59 100644
--- a/apps/files_external/l10n/zh_TW.js
+++ b/apps/files_external/l10n/zh_TW.js
@@ -1,29 +1,27 @@
 OC.L10N.register(
     "files_external",
     {
-    "Please provide a valid Dropbox app key and secret." : "請提供有效的 Dropbox app key 和 app secret 。",
     "External storage" : "外部儲存",
-    "Local" : "本地",
-    "Location" : "地點",
+    "Personal" : "個人",
+    "System" : "系統",
+    "Grant access" : "允許存取",
+    "Access granted" : "允許存取",
+    "Saved" : "已儲存",
+    "None" : "無",
+    "Username" : "使用者名稱",
+    "Password" : "密碼",
+    "API key" : "API金鑰",
     "Amazon S3" : "Amazon S3",
-    "Key" : "鑰",
-    "Secret" : "密",
-    "Secret Key" : "密鑰",
     "Port" : "連接埠",
     "Region" : "地區",
     "Enable SSL" : "啟用 SSL",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Host" : "主機",
-    "Username" : "使用者名稱",
-    "Password" : "密碼",
+    "Local" : "本地",
+    "Location" : "地點",
+    "ownCloud" : "ownCloud",
     "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> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>警告:</b> PHP 並未啓用 Curl 的支援，因此無法掛載 %s 。請洽您的系統管理員將其安裝並啓用。",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>警告</b>：PHP 並未啓用 FTP 的支援，因此無法掛載 %s，請洽您的系統管理員將其安裝並啓用。",
@@ -33,8 +31,8 @@ OC.L10N.register(
     "Folder name" : "資料夾名稱",
     "Configuration" : "設定",
     "Available for" : "可用的",
-    "Add storage" : "增加儲存區",
     "Delete" : "刪除",
+    "Add storage" : "增加儲存區",
     "Enable User External Storage" : "啓用使用者外部儲存",
     "Allow users to mount the following external storage" : "允許使用者自行掛載以下的外部儲存"
 },
diff --git a/apps/files_external/l10n/zh_TW.json b/apps/files_external/l10n/zh_TW.json
index 84d1abf182a..1ed049bc079 100644
--- a/apps/files_external/l10n/zh_TW.json
+++ b/apps/files_external/l10n/zh_TW.json
@@ -1,27 +1,25 @@
 { "translations": {
-    "Please provide a valid Dropbox app key and secret." : "請提供有效的 Dropbox app key 和 app secret 。",
     "External storage" : "外部儲存",
-    "Local" : "本地",
-    "Location" : "地點",
+    "Personal" : "個人",
+    "System" : "系統",
+    "Grant access" : "允許存取",
+    "Access granted" : "允許存取",
+    "Saved" : "已儲存",
+    "None" : "無",
+    "Username" : "使用者名稱",
+    "Password" : "密碼",
+    "API key" : "API金鑰",
     "Amazon S3" : "Amazon S3",
-    "Key" : "鑰",
-    "Secret" : "密",
-    "Secret Key" : "密鑰",
     "Port" : "連接埠",
     "Region" : "地區",
     "Enable SSL" : "啟用 SSL",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Host" : "主機",
-    "Username" : "使用者名稱",
-    "Password" : "密碼",
+    "Local" : "本地",
+    "Location" : "地點",
+    "ownCloud" : "ownCloud",
     "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> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>警告:</b> PHP 並未啓用 Curl 的支援，因此無法掛載 %s 。請洽您的系統管理員將其安裝並啓用。",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>警告</b>：PHP 並未啓用 FTP 的支援，因此無法掛載 %s，請洽您的系統管理員將其安裝並啓用。",
@@ -31,8 +29,8 @@
     "Folder name" : "資料夾名稱",
     "Configuration" : "設定",
     "Available for" : "可用的",
-    "Add storage" : "增加儲存區",
     "Delete" : "刪除",
+    "Add storage" : "增加儲存區",
     "Enable User External Storage" : "啓用使用者外部儲存",
     "Allow users to mount the following external storage" : "允許使用者自行掛載以下的外部儲存"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index fd98d26f834..7c6ac4cbdd5 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -122,7 +122,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 		$params['region'] = empty($params['region']) ? 'eu-west-1' : $params['region'];
 		$params['hostname'] = empty($params['hostname']) ? 's3.amazonaws.com' : $params['hostname'];
 		if (!isset($params['port']) || $params['port'] === '') {
-			$params['port'] = ($params['use_ssl'] === 'false') ? 80 : 443;
+			$params['port'] = ($params['use_ssl'] === false) ? 80 : 443;
 		}
 		$this->params = $params;
 	}
@@ -585,7 +585,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 			return $this->connection;
 		}
 
-		$scheme = ($this->params['use_ssl'] === 'false') ? 'http' : 'https';
+		$scheme = ($this->params['use_ssl'] === false) ? 'http' : 'https';
 		$base_url = $scheme . '://' . $this->params['hostname'] . ':' . $this->params['port'] . '/';
 
 		$this->connection = S3Client::factory(array(
diff --git a/apps/files_external/lib/auth/amazons3/accesskey.php b/apps/files_external/lib/auth/amazons3/accesskey.php
new file mode 100644
index 00000000000..9e3aab374b9
--- /dev/null
+++ b/apps/files_external/lib/auth/amazons3/accesskey.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_External\Lib\Auth\AmazonS3;
+
+use \OCP\IL10N;
+use \OCA\Files_External\Lib\DefinitionParameter;
+use \OCA\Files_External\Lib\Auth\AuthMechanism;
+
+/**
+ * Amazon S3 access key authentication
+ */
+class AccessKey extends AuthMechanism {
+
+	const SCHEME_AMAZONS3_ACCESSKEY = 'amazons3_accesskey';
+
+	public function __construct(IL10N $l) {
+		$this
+			->setIdentifier('amazons3::accesskey')
+			->setScheme(self::SCHEME_AMAZONS3_ACCESSKEY)
+			->setText($l->t('Access key'))
+			->addParameters([
+				(new DefinitionParameter('key', $l->t('Access key'))),
+				(new DefinitionParameter('secret', $l->t('Secret key')))
+					->setType(DefinitionParameter::VALUE_PASSWORD),
+			]);
+	}
+
+}
diff --git a/apps/files_external/lib/auth/authmechanism.php b/apps/files_external/lib/auth/authmechanism.php
index 11d99bb330d..ddc0c6a4dca 100644
--- a/apps/files_external/lib/auth/authmechanism.php
+++ b/apps/files_external/lib/auth/authmechanism.php
@@ -22,7 +22,7 @@
 namespace OCA\Files_External\Lib\Auth;
 
 use \OCA\Files_External\Lib\StorageConfig;
-use \OCA\Files_External\Lib\VisibilityTrait;
+use \OCA\Files_External\Lib\PermissionsTrait;
 use \OCA\Files_External\Lib\IdentifierTrait;
 use \OCA\Files_External\Lib\FrontendDefinitionTrait;
 use \OCA\Files_External\Lib\StorageModifierTrait;
@@ -40,7 +40,7 @@ use \OCA\Files_External\Lib\StorageModifierTrait;
  * scheme, which are provided from the authentication mechanism.
  *
  * This class uses the following traits:
- *  - VisibilityTrait
+ *  - PermissionsTrait
  *      Restrict usage to admin-only/none
  *  - FrontendDefinitionTrait
  *      Specify configuration parameters and other definitions
@@ -58,7 +58,7 @@ class AuthMechanism implements \JsonSerializable {
 	const SCHEME_PUBLICKEY = 'publickey';
 	const SCHEME_OPENSTACK = 'openstack';
 
-	use VisibilityTrait;
+	use PermissionsTrait;
 	use FrontendDefinitionTrait;
 	use StorageModifierTrait;
 	use IdentifierTrait;
diff --git a/apps/files_external/lib/auth/oauth1/oauth1.php b/apps/files_external/lib/auth/oauth1/oauth1.php
new file mode 100644
index 00000000000..3fb1b16aa6d
--- /dev/null
+++ b/apps/files_external/lib/auth/oauth1/oauth1.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_External\Lib\Auth\OAuth1;
+
+use \OCP\IL10N;
+use \OCA\Files_External\Lib\DefinitionParameter;
+use \OCA\Files_External\Lib\Auth\AuthMechanism;
+
+/**
+ * OAuth1 authentication
+ */
+class OAuth1 extends AuthMechanism {
+
+	public function __construct(IL10N $l) {
+		$this
+			->setIdentifier('oauth1::oauth1')
+			->setScheme(self::SCHEME_OAUTH1)
+			->setText($l->t('OAuth1'))
+			->addParameters([
+				(new DefinitionParameter('configured', 'configured'))
+					->setType(DefinitionParameter::VALUE_HIDDEN),
+				(new DefinitionParameter('app_key', $l->t('App key'))),
+				(new DefinitionParameter('app_secret', $l->t('App secret')))
+					->setType(DefinitionParameter::VALUE_PASSWORD),
+				(new DefinitionParameter('token', 'token'))
+					->setType(DefinitionParameter::VALUE_HIDDEN),
+				(new DefinitionParameter('token_secret', 'token_secret'))
+					->setType(DefinitionParameter::VALUE_HIDDEN),
+			])
+			->setCustomJs('oauth1')
+		;
+	}
+
+}
diff --git a/apps/files_external/lib/auth/oauth2/oauth2.php b/apps/files_external/lib/auth/oauth2/oauth2.php
new file mode 100644
index 00000000000..73faa85a44e
--- /dev/null
+++ b/apps/files_external/lib/auth/oauth2/oauth2.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_External\Lib\Auth\OAuth2;
+
+use \OCP\IL10N;
+use \OCA\Files_External\Lib\DefinitionParameter;
+use \OCA\Files_External\Lib\Auth\AuthMechanism;
+
+/**
+ * OAuth2 authentication
+ */
+class OAuth2 extends AuthMechanism {
+
+	public function __construct(IL10N $l) {
+		$this
+			->setIdentifier('oauth2::oauth2')
+			->setScheme(self::SCHEME_OAUTH2)
+			->setText($l->t('OAuth2'))
+			->addParameters([
+				(new DefinitionParameter('configured', 'configured'))
+					->setType(DefinitionParameter::VALUE_HIDDEN),
+				(new DefinitionParameter('client_id', $l->t('Client ID'))),
+				(new DefinitionParameter('client_secret', $l->t('Client secret')))
+					->setType(DefinitionParameter::VALUE_PASSWORD),
+				(new DefinitionParameter('token', 'token'))
+					->setType(DefinitionParameter::VALUE_HIDDEN),
+			])
+			->setCustomJs('oauth2')
+		;
+	}
+
+}
diff --git a/apps/files_external/lib/auth/openstack/openstack.php b/apps/files_external/lib/auth/openstack/openstack.php
new file mode 100644
index 00000000000..faf356bcf2e
--- /dev/null
+++ b/apps/files_external/lib/auth/openstack/openstack.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_External\Lib\Auth\OpenStack;
+
+use \OCP\IL10N;
+use \OCA\Files_External\Lib\DefinitionParameter;
+use \OCA\Files_External\Lib\Auth\AuthMechanism;
+
+/**
+ * OpenStack Keystone authentication
+ */
+class OpenStack extends AuthMechanism {
+
+	public function __construct(IL10N $l) {
+		$this
+			->setIdentifier('openstack::openstack')
+			->setScheme(self::SCHEME_OPENSTACK)
+			->setText($l->t('OpenStack'))
+			->addParameters([
+				(new DefinitionParameter('user', $l->t('Username'))),
+				(new DefinitionParameter('password', $l->t('Password')))
+					->setType(DefinitionParameter::VALUE_PASSWORD),
+				(new DefinitionParameter('tenant', $l->t('Tenant name'))),
+				(new DefinitionParameter('url', $l->t('Identity endpoint URL'))),
+			])
+		;
+	}
+
+}
diff --git a/apps/files_external/lib/auth/openstack/rackspace.php b/apps/files_external/lib/auth/openstack/rackspace.php
new file mode 100644
index 00000000000..9268f3aad87
--- /dev/null
+++ b/apps/files_external/lib/auth/openstack/rackspace.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_External\Lib\Auth\OpenStack;
+
+use \OCP\IL10N;
+use \OCA\Files_External\Lib\DefinitionParameter;
+use \OCA\Files_External\Lib\Auth\AuthMechanism;
+
+/**
+ * Rackspace authentication
+ */
+class Rackspace extends AuthMechanism {
+
+	public function __construct(IL10N $l) {
+		$this
+			->setIdentifier('openstack::rackspace')
+			->setScheme(self::SCHEME_OPENSTACK)
+			->setText($l->t('Rackspace'))
+			->addParameters([
+				(new DefinitionParameter('user', $l->t('Username'))),
+				(new DefinitionParameter('key', $l->t('API key')))
+					->setType(DefinitionParameter::VALUE_PASSWORD),
+			])
+		;
+	}
+
+}
diff --git a/apps/files_external/lib/auth/publickey/rsa.php b/apps/files_external/lib/auth/publickey/rsa.php
new file mode 100644
index 00000000000..f40136dda01
--- /dev/null
+++ b/apps/files_external/lib/auth/publickey/rsa.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_External\Lib\Auth\PublicKey;
+
+use \OCP\IL10N;
+use \OCA\Files_External\Lib\DefinitionParameter;
+use \OCA\Files_External\Lib\Auth\AuthMechanism;
+use \OCA\Files_External\Lib\StorageConfig;
+use \OCP\IConfig;
+use \phpseclib\Crypt\RSA as RSACrypt;
+
+/**
+ * RSA public key authentication
+ */
+class RSA extends AuthMechanism {
+
+	const CREATE_KEY_BITS = 1024;
+
+	/** @var IConfig */
+	private $config;
+
+	public function __construct(IL10N $l, IConfig $config) {
+		$this->config = $config;
+
+		$this
+			->setIdentifier('publickey::rsa')
+			->setScheme(self::SCHEME_PUBLICKEY)
+			->setText($l->t('RSA public key'))
+			->addParameters([
+				(new DefinitionParameter('user', $l->t('Username'))),
+				(new DefinitionParameter('public_key', $l->t('Public key'))),
+				(new DefinitionParameter('private_key', 'private_key'))
+					->setType(DefinitionParameter::VALUE_HIDDEN),
+			])
+			->setCustomJs('public_key')
+		;
+	}
+
+	public function manipulateStorageConfig(StorageConfig &$storage) {
+		$auth = new RSACrypt();
+		$auth->setPassword($this->config->getSystemValue('secret', ''));
+		if (!$auth->loadKey($storage->getBackendOption('private_key'))) {
+			throw new \RuntimeException('unable to load private key');
+		}
+		$storage->setBackendOption('public_key_auth', $auth);
+	}
+
+	/**
+	 * Generate a keypair
+	 *
+	 * @return array ['privatekey' => $privateKey, 'publickey' => $publicKey]
+	 */
+	public function createKey() {
+		$rsa = new RSACrypt();
+		$rsa->setPublicKeyFormat(RSACrypt::PUBLIC_FORMAT_OPENSSH);
+		$rsa->setPassword($this->config->getSystemValue('secret', ''));
+
+		return $rsa->createKey(self::CREATE_KEY_BITS);
+	}
+
+}
diff --git a/apps/files_external/lib/backend/amazons3.php b/apps/files_external/lib/backend/amazons3.php
new file mode 100644
index 00000000000..1cf62d7cb09
--- /dev/null
+++ b/apps/files_external/lib/backend/amazons3.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_External\Lib\Backend;
+
+use \OCP\IL10N;
+use \OCA\Files_External\Lib\Backend\Backend;
+use \OCA\Files_External\Lib\DefinitionParameter;
+use \OCA\Files_External\Lib\Auth\AuthMechanism;
+use \OCA\Files_External\Service\BackendService;
+use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
+
+use \OCA\Files_External\Lib\Auth\AmazonS3\AccessKey;
+
+class AmazonS3 extends Backend {
+
+	use LegacyDependencyCheckPolyfill;
+
+	public function __construct(IL10N $l, AccessKey $legacyAuth) {
+		$this
+			->setIdentifier('amazons3')
+			->addIdentifierAlias('\OC\Files\Storage\AmazonS3') // legacy compat
+			->setStorageClass('\OC\Files\Storage\AmazonS3')
+			->setText($l->t('Amazon S3'))
+			->addParameters([
+				(new DefinitionParameter('bucket', $l->t('Bucket'))),
+				(new DefinitionParameter('hostname', $l->t('Hostname')))
+					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+				(new DefinitionParameter('port', $l->t('Port')))
+					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+				(new DefinitionParameter('region', $l->t('Region')))
+					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+				(new DefinitionParameter('use_ssl', $l->t('Enable SSL')))
+					->setType(DefinitionParameter::VALUE_BOOLEAN),
+				(new DefinitionParameter('use_path_style', $l->t('Enable Path Style')))
+					->setType(DefinitionParameter::VALUE_BOOLEAN),
+			])
+			->addAuthScheme(AccessKey::SCHEME_AMAZONS3_ACCESSKEY)
+			->setLegacyAuthMechanism($legacyAuth)
+		;
+	}
+
+}
diff --git a/apps/files_external/lib/backend/backend.php b/apps/files_external/lib/backend/backend.php
index 90d5d38ed94..2a2add3ac59 100644
--- a/apps/files_external/lib/backend/backend.php
+++ b/apps/files_external/lib/backend/backend.php
@@ -22,7 +22,7 @@
 namespace OCA\Files_External\Lib\Backend;
 
 use \OCA\Files_External\Lib\StorageConfig;
-use \OCA\Files_External\Lib\VisibilityTrait;
+use \OCA\Files_External\Lib\PermissionsTrait;
 use \OCA\Files_External\Lib\FrontendDefinitionTrait;
 use \OCA\Files_External\Lib\PriorityTrait;
 use \OCA\Files_External\Lib\DependencyTrait;
@@ -43,7 +43,7 @@ use \OCA\Files_External\Lib\Auth\AuthMechanism;
  * scheme, which are provided from the authentication mechanism.
  *
  * This class uses the following traits:
- *  - VisibilityTrait
+ *  - PermissionsTrait
  *      Restrict usage to admin-only/none
  *  - FrontendDefinitionTrait
  *      Specify configuration parameters and other definitions
@@ -56,7 +56,7 @@ use \OCA\Files_External\Lib\Auth\AuthMechanism;
  */
 class Backend implements \JsonSerializable {
 
-	use VisibilityTrait;
+	use PermissionsTrait;
 	use FrontendDefinitionTrait;
 	use PriorityTrait;
 	use DependencyTrait;
diff --git a/apps/files_external/lib/backend/dav.php b/apps/files_external/lib/backend/dav.php
index 5ae6d122588..c4f446548e1 100644
--- a/apps/files_external/lib/backend/dav.php
+++ b/apps/files_external/lib/backend/dav.php
@@ -26,11 +26,14 @@ use \OCA\Files_External\Lib\Backend\Backend;
 use \OCA\Files_External\Lib\DefinitionParameter;
 use \OCA\Files_External\Lib\Auth\AuthMechanism;
 use \OCA\Files_External\Service\BackendService;
+use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
 
 use \OCA\Files_External\Lib\Auth\Password\Password;
 
 class DAV extends Backend {
 
+	use LegacyDependencyCheckPolyfill;
+
 	public function __construct(IL10N $l, Password $legacyAuth) {
 		$this
 			->setIdentifier('dav')
@@ -44,7 +47,6 @@ class DAV extends Backend {
 				(new DefinitionParameter('secure', $l->t('Secure https://')))
 					->setType(DefinitionParameter::VALUE_BOOLEAN),
 			])
-			->setDependencyCheck('\OC\Files\Storage\DAV::checkDependencies')
 			->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
 			->setLegacyAuthMechanism($legacyAuth)
 		;
diff --git a/apps/files_external/lib/backend/dropbox.php b/apps/files_external/lib/backend/dropbox.php
new file mode 100644
index 00000000000..3e595cb0a9c
--- /dev/null
+++ b/apps/files_external/lib/backend/dropbox.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_External\Lib\Backend;
+
+use \OCP\IL10N;
+use \OCA\Files_External\Lib\Backend\Backend;
+use \OCA\Files_External\Lib\DefinitionParameter;
+use \OCA\Files_External\Lib\Auth\AuthMechanism;
+use \OCA\Files_External\Service\BackendService;
+use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
+
+use \OCA\Files_External\Lib\Auth\OAuth1\OAuth1;
+
+class Dropbox extends Backend {
+
+	use LegacyDependencyCheckPolyfill;
+
+	public function __construct(IL10N $l, OAuth1 $legacyAuth) {
+		$this
+			->setIdentifier('dropbox')
+			->addIdentifierAlias('\OC\Files\Storage\Dropbox') // legacy compat
+			->setStorageClass('\OC\Files\Storage\Dropbox')
+			->setText($l->t('Dropbox'))
+			->addParameters([
+				// all parameters handled in OAuth1 mechanism
+			])
+			->addAuthScheme(AuthMechanism::SCHEME_OAUTH1)
+			->setLegacyAuthMechanism($legacyAuth)
+		;
+	}
+
+}
diff --git a/apps/files_external/lib/backend/ftp.php b/apps/files_external/lib/backend/ftp.php
index df6ca37679e..1caf3a8fcb8 100644
--- a/apps/files_external/lib/backend/ftp.php
+++ b/apps/files_external/lib/backend/ftp.php
@@ -26,11 +26,14 @@ use \OCA\Files_External\Lib\Backend\Backend;
 use \OCA\Files_External\Lib\DefinitionParameter;
 use \OCA\Files_External\Lib\Auth\AuthMechanism;
 use \OCA\Files_External\Service\BackendService;
+use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
 
 use \OCA\Files_External\Lib\Auth\Password\Password;
 
 class FTP extends Backend {
 
+	use LegacyDependencyCheckPolyfill;
+
 	public function __construct(IL10N $l, Password $legacyAuth) {
 		$this
 			->setIdentifier('ftp')
@@ -44,7 +47,6 @@ class FTP extends Backend {
 				(new DefinitionParameter('secure', $l->t('Secure ftps://')))
 					->setType(DefinitionParameter::VALUE_BOOLEAN),
 			])
-			->setDependencyCheck('\OC\Files\Storage\FTP::checkDependencies')
 			->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
 			->setLegacyAuthMechanism($legacyAuth)
 		;
diff --git a/apps/files_external/lib/backend/google.php b/apps/files_external/lib/backend/google.php
new file mode 100644
index 00000000000..bc0b52c464b
--- /dev/null
+++ b/apps/files_external/lib/backend/google.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_External\Lib\Backend;
+
+use \OCP\IL10N;
+use \OCA\Files_External\Lib\Backend\Backend;
+use \OCA\Files_External\Lib\DefinitionParameter;
+use \OCA\Files_External\Lib\Auth\AuthMechanism;
+use \OCA\Files_External\Service\BackendService;
+use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
+
+use \OCA\Files_External\Lib\Auth\OAuth2\OAuth2;
+
+class Google extends Backend {
+
+	use LegacyDependencyCheckPolyfill;
+
+	public function __construct(IL10N $l, OAuth2 $legacyAuth) {
+		$this
+			->setIdentifier('googledrive')
+			->addIdentifierAlias('\OC\Files\Storage\Google') // legacy compat
+			->setStorageClass('\OC\Files\Storage\Google')
+			->setText($l->t('Google Drive'))
+			->addParameters([
+				// all parameters handled in OAuth2 mechanism
+			])
+			->addAuthScheme(AuthMechanism::SCHEME_OAUTH2)
+			->setLegacyAuthMechanism($legacyAuth)
+		;
+	}
+
+}
diff --git a/apps/files_external/lib/backend/legacybackend.php b/apps/files_external/lib/backend/legacybackend.php
index 0f60c2caa47..83a5b45940d 100644
--- a/apps/files_external/lib/backend/legacybackend.php
+++ b/apps/files_external/lib/backend/legacybackend.php
@@ -24,12 +24,21 @@ namespace OCA\Files_External\Lib\Backend;
 use \OCA\Files_External\Lib\DefinitionParameter;
 use \OCA\Files_External\Lib\Backend\Backend;
 use \OCA\Files_External\Lib\Auth\Builtin;
+use \OCA\Files_External\Lib\MissingDependency;
+use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
 
 /**
  * Legacy compatibility for OC_Mount_Config::registerBackend()
  */
 class LegacyBackend extends Backend {
 
+	use LegacyDependencyCheckPolyfill {
+		LegacyDependencyCheckPolyfill::checkDependencies as doCheckDependencies;
+	}
+
+	/** @var bool */
+	protected $hasDependencies = false;
+
 	/**
 	 * @param string $class
 	 * @param array $definition
@@ -78,8 +87,18 @@ class LegacyBackend extends Backend {
 			$this->setCustomJs($definition['custom']);
 		}
 		if (isset($definition['has_dependencies']) && $definition['has_dependencies']) {
-			$this->setDependencyCheck($class . '::checkDependencies');
+			$this->hasDependencies = true;
+		}
+	}
+
+	/**
+	 * @return MissingDependency[]
+	 */
+	public function checkDependencies() {
+		if ($this->hasDependencies) {
+			return $this->doCheckDependencies();
 		}
+		return [];
 	}
 
 }
diff --git a/apps/files_external/lib/backend/local.php b/apps/files_external/lib/backend/local.php
index a80b437fab7..a6635491b6e 100644
--- a/apps/files_external/lib/backend/local.php
+++ b/apps/files_external/lib/backend/local.php
@@ -39,7 +39,7 @@ class Local extends Backend {
 			->addParameters([
 				(new DefinitionParameter('datadir', $l->t('Location'))),
 			])
-			->setAllowedVisibility(BackendService::VISIBILITY_ADMIN)
+			->setAllowedPermissions(BackendService::USER_PERSONAL, BackendService::PERMISSION_NONE)
 			->setPriority(BackendService::PRIORITY_DEFAULT + 50)
 			->addAuthScheme(AuthMechanism::SCHEME_NULL)
 			->setLegacyAuthMechanism($legacyAuth)
diff --git a/apps/files_external/lib/backend/sftp.php b/apps/files_external/lib/backend/sftp.php
index dd0f5d8e2e0..c0bcd27c54b 100644
--- a/apps/files_external/lib/backend/sftp.php
+++ b/apps/files_external/lib/backend/sftp.php
@@ -43,6 +43,7 @@ class SFTP extends Backend {
 					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
 			])
 			->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
+			->addAuthScheme(AuthMechanism::SCHEME_PUBLICKEY)
 			->setLegacyAuthMechanism($legacyAuth)
 		;
 	}
diff --git a/apps/files_external/lib/backend/sftp_key.php b/apps/files_external/lib/backend/sftp_key.php
new file mode 100644
index 00000000000..6a75172026d
--- /dev/null
+++ b/apps/files_external/lib/backend/sftp_key.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_External\Lib\Backend;
+
+use \OCP\IL10N;
+use \OCA\Files_External\Lib\Backend\Backend;
+use \OCA\Files_External\Lib\DefinitionParameter;
+use \OCA\Files_External\Lib\Auth\AuthMechanism;
+use \OCA\Files_External\Service\BackendService;
+use \OCA\Files_External\Lib\Auth\PublicKey\RSA;
+
+class SFTP_Key extends Backend {
+
+	public function __construct(IL10N $l, RSA $legacyAuth) {
+		$this
+			->setIdentifier('\OC\Files\Storage\SFTP_Key')
+			->setStorageClass('\OC\Files\Storage\SFTP')
+			->setText($l->t('SFTP with secret key login [DEPRECATED]'))
+			->addParameters([
+				(new DefinitionParameter('host', $l->t('Host'))),
+				(new DefinitionParameter('root', $l->t('Remote subfolder')))
+					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+			])
+			->removeAllowedPermission(BackendService::USER_PERSONAL, BackendService::PERMISSION_CREATE)
+			->removeAllowedPermission(BackendService::USER_ADMIN, BackendService::PERMISSION_CREATE)
+			->addAuthScheme(AuthMechanism::SCHEME_PUBLICKEY)
+			->setLegacyAuthMechanism($legacyAuth)
+		;
+	}
+
+}
diff --git a/apps/files_external/lib/backend/smb.php b/apps/files_external/lib/backend/smb.php
index dc15f6d3dbf..0613d3112ee 100644
--- a/apps/files_external/lib/backend/smb.php
+++ b/apps/files_external/lib/backend/smb.php
@@ -26,11 +26,14 @@ use \OCA\Files_External\Lib\Backend\Backend;
 use \OCA\Files_External\Lib\DefinitionParameter;
 use \OCA\Files_External\Lib\Auth\AuthMechanism;
 use \OCA\Files_External\Service\BackendService;
+use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
 
 use \OCA\Files_External\Lib\Auth\Password\Password;
 
 class SMB extends Backend {
 
+	use LegacyDependencyCheckPolyfill;
+
 	public function __construct(IL10N $l, Password $legacyAuth) {
 		$this
 			->setIdentifier('smb')
@@ -45,7 +48,6 @@ class SMB extends Backend {
 				(new DefinitionParameter('domain', $l->t('Domain')))
 					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
 			])
-			->setDependencyCheck('\OC\Files\Storage\SMB::checkDependencies')
 			->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
 			->setLegacyAuthMechanism($legacyAuth)
 		;
diff --git a/apps/files_external/lib/backend/smb_oc.php b/apps/files_external/lib/backend/smb_oc.php
new file mode 100644
index 00000000000..d21b0ddaf42
--- /dev/null
+++ b/apps/files_external/lib/backend/smb_oc.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_External\Lib\Backend;
+
+use \OCP\IL10N;
+use \OCA\Files_External\Lib\Backend\Backend;
+use \OCA\Files_External\Lib\DefinitionParameter;
+use \OCA\Files_External\Lib\Auth\AuthMechanism;
+use \OCA\Files_External\Service\BackendService;
+use \OCA\Files_External\Lib\Auth\Password\SessionCredentials;
+use \OCA\Files_External\Lib\StorageConfig;
+use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
+
+/**
+ * Deprecated SMB_OC class - use SMB with the password::sessioncredentials auth mechanism
+ */
+class SMB_OC extends Backend {
+
+	use LegacyDependencyCheckPolyfill;
+
+	public function __construct(IL10N $l, SessionCredentials $legacyAuth) {
+		$this
+			->setIdentifier('\OC\Files\Storage\SMB_OC')
+			->setStorageClass('\OC\Files\Storage\SMB')
+			->setText($l->t('SMB / CIFS using OC login [DEPRECATED]'))
+			->addParameters([
+				(new DefinitionParameter('host', $l->t('Host'))),
+				(new DefinitionParameter('username_as_share', $l->t('Username as share')))
+					->setType(DefinitionParameter::VALUE_BOOLEAN),
+				(new DefinitionParameter('share', $l->t('Share')))
+					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+				(new DefinitionParameter('root', $l->t('Remote subfolder')))
+					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+			])
+			->removeAllowedPermission(BackendService::USER_PERSONAL, BackendService::PERMISSION_CREATE)
+			->removeAllowedPermission(BackendService::USER_ADMIN, BackendService::PERMISSION_CREATE)
+			->setPriority(BackendService::PRIORITY_DEFAULT - 10)
+			->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
+			->setLegacyAuthMechanism($legacyAuth)
+		;
+	}
+
+	public function manipulateStorageConfig(StorageConfig &$storage) {
+		$username_as_share = ($storage->getBackendOption('username_as_share') === true);
+
+		if ($username_as_share) {
+			$share = '/' . $storage->getBackendOption('user');
+			$storage->setBackendOption('share', $share);
+		}
+	}
+
+}
diff --git a/apps/files_external/lib/backend/swift.php b/apps/files_external/lib/backend/swift.php
new file mode 100644
index 00000000000..2e14855206c
--- /dev/null
+++ b/apps/files_external/lib/backend/swift.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_External\Lib\Backend;
+
+use \OCP\IL10N;
+use \OCA\Files_External\Lib\Backend\Backend;
+use \OCA\Files_External\Lib\DefinitionParameter;
+use \OCA\Files_External\Lib\Auth\AuthMechanism;
+use \OCA\Files_External\Service\BackendService;
+use \OCA\Files_External\Lib\Auth\OpenStack\OpenStack;
+use \OCA\Files_External\Lib\Auth\OpenStack\Rackspace;
+use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
+
+class Swift extends Backend {
+
+	use LegacyDependencyCheckPolyfill;
+
+	public function __construct(IL10N $l, OpenStack $openstackAuth, Rackspace $rackspaceAuth) {
+		$this
+			->setIdentifier('swift')
+			->addIdentifierAlias('\OC\Files\Storage\Swift') // legacy compat
+			->setStorageClass('\OC\Files\Storage\Swift')
+			->setText($l->t('OpenStack Object Storage'))
+			->addParameters([
+				(new DefinitionParameter('service_name', $l->t('Service name')))
+					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+				(new DefinitionParameter('region', $l->t('Region')))
+					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+				(new DefinitionParameter('bucket', $l->t('Bucket'))),
+				(new DefinitionParameter('timeout', $l->t('Request timeout (seconds)')))
+					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+			])
+			->addAuthScheme(AuthMechanism::SCHEME_OPENSTACK)
+			->setLegacyAuthMechanismCallback(function(array $params) use ($openstackAuth, $rackspaceAuth) {
+				if (isset($params['options']['key']) && $params['options']['key']) {
+					return $rackspaceAuth;
+				}
+				return $openstackAuth;
+			})
+		;
+	}
+
+}
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index b4c6867a26c..2dc7de30a6c 100644
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -81,9 +81,7 @@ class OC_Mount_Config {
 	 * @param array $data
 	 */
 	public static function initMountPointsHook($data) {
-		self::addStorageIdToConfig(null);
 		if ($data['user']) {
-			self::addStorageIdToConfig($data['user']);
 			$user = \OC::$server->getUserManager()->get($data['user']);
 			if (!$user) {
 				\OC::$server->getLogger()->warning(
@@ -210,7 +208,6 @@ class OC_Mount_Config {
 			'users' => $storage->getApplicableUsers(),
 		];
 		$mountEntry['id'] = $storage->getId();
-		// $mountEntry['storage_id'] = null; // we don't store this!
 
 		return $mountEntry;
 	}
@@ -230,7 +227,9 @@ class OC_Mount_Config {
 				}
 			}
 		} else {
-			$input = str_replace('$user', $user, $input);
+			if (is_string($input)) {
+				$input = str_replace('$user', $user, $input);
+			}
 		}
 		return $input;
 	}
@@ -308,14 +307,6 @@ class OC_Mount_Config {
 			$file = $config->getSystemValue('mount_file', $datadir . '/mount.json');
 		}
 
-		foreach ($data as &$applicables) {
-			foreach ($applicables as &$mountPoints) {
-				foreach ($mountPoints as &$options) {
-					self::addStorageId($options);
-				}
-			}
-		}
-
 		$content = json_encode($data, JSON_PRETTY_PRINT);
 		@file_put_contents($file, $content);
 		@chmod($file, 0640);
@@ -490,60 +481,4 @@ class OC_Mount_Config {
 		);
 		return hash('md5', $data);
 	}
-
-	/**
-	 * Add storage id to the storage configurations that did not have any.
-	 *
-	 * @param string $user user for which to process storage configs
-	 */
-	private static function addStorageIdToConfig($user) {
-		$config = self::readData($user);
-
-		$needUpdate = false;
-		foreach ($config as &$applicables) {
-			foreach ($applicables as &$mountPoints) {
-				foreach ($mountPoints as &$options) {
-					$needUpdate |= !isset($options['storage_id']);
-				}
-			}
-		}
-
-		if ($needUpdate) {
-			self::writeData($user, $config);
-		}
-	}
-
-	/**
-	 * Get storage id from the numeric storage id and set
-	 * it into the given options argument. Only do this
-	 * if there was no storage id set yet.
-	 *
-	 * This might also fail if a storage wasn't fully configured yet
-	 * and couldn't be mounted, in which case this will simply return false.
-	 *
-	 * @param array $options storage options
-	 *
-	 * @return bool true if the storage id was added, false otherwise
-	 */
-	private static function addStorageId(&$options) {
-		if (isset($options['storage_id'])) {
-			return false;
-		}
-
-		$service = self::$app->getContainer()->query('OCA\Files_External\Service\BackendService');
-		$class = $service->getBackend($options['backend'])->getStorageClass();
-		try {
-			/** @var \OC\Files\Storage\Storage $storage */
-			$storage = new $class($options['options']);
-			// TODO: introduce StorageConfigException
-		} catch (\Exception $e) {
-			// storage might not be fully configured yet (ex: Dropbox)
-			// note that storage instances aren't supposed to open any connections
-			// in the constructor, so this exception is likely to be a config exception
-			return false;
-		}
-
-		$options['storage_id'] = $storage->getCache()->getNumericStorageId();
-		return true;
-	}
 }
diff --git a/apps/files_external/lib/config/configadapter.php b/apps/files_external/lib/config/configadapter.php
index a15d9e06a5f..a255a7b3d25 100644
--- a/apps/files_external/lib/config/configadapter.php
+++ b/apps/files_external/lib/config/configadapter.php
@@ -74,6 +74,9 @@ class ConfigAdapter implements IMountProvider {
 		$objectStore = $storage->getBackendOption('objectstore');
 		if ($objectStore) {
 			$objectClass = $objectStore['class'];
+			if (!is_subclass_of($objectClass, '\OCP\Files\ObjectStore\IObjectStore')) {
+				throw new \InvalidArgumentException('Invalid object store');
+			}
 			$storage->setBackendOption('objectstore', new $objectClass($objectStore));
 		}
 
diff --git a/apps/files_external/lib/definitionparameter.php b/apps/files_external/lib/definitionparameter.php
index 4b560908b69..7f883e5fad1 100644
--- a/apps/files_external/lib/definitionparameter.php
+++ b/apps/files_external/lib/definitionparameter.php
@@ -154,22 +154,31 @@ class DefinitionParameter implements \JsonSerializable {
 
 	/**
 	 * Validate a parameter value against this
+	 * Convert type as necessary
 	 *
 	 * @param mixed $value Value to check
 	 * @return bool success
 	 */
-	public function validateValue($value) {
-		if ($this->getFlags() & self::FLAG_OPTIONAL) {
-			return true;
-		}
+	public function validateValue(&$value) {
+		$optional = $this->getFlags() & self::FLAG_OPTIONAL;
+
 		switch ($this->getType()) {
 		case self::VALUE_BOOLEAN:
 			if (!is_bool($value)) {
-				return false;
+				switch ($value) {
+				case 'true':
+					$value = true;
+					break;
+				case 'false':
+					$value = false;
+					break;
+				default:
+					return false;
+				}
 			}
 			break;
 		default:
-			if (empty($value)) {
+			if (!$value && !$optional) {
 				return false;
 			}
 			break;
diff --git a/apps/files_external/lib/dependencytrait.php b/apps/files_external/lib/dependencytrait.php
index 116421eab14..f0d6d6080e5 100644
--- a/apps/files_external/lib/dependencytrait.php
+++ b/apps/files_external/lib/dependencytrait.php
@@ -28,58 +28,13 @@ use \OCA\Files_External\Lib\MissingDependency;
  */
 trait DependencyTrait {
 
-	/** @var callable|null dependency check */
-	private $dependencyCheck = null;
-
-	/**
-	 * @return bool
-	 */
-	public function hasDependencies() {
-		return !is_null($this->dependencyCheck);
-	}
-
-	/**
-	 * @param callable $dependencyCheck
-	 * @return self
-	 */
-	public function setDependencyCheck(callable $dependencyCheck) {
-		$this->dependencyCheck = $dependencyCheck;
-		return $this;
-	}
-
 	/**
 	 * Check if object is valid for use
 	 *
 	 * @return MissingDependency[] Unsatisfied dependencies
 	 */
 	public function checkDependencies() {
-		$ret = [];
-
-		if ($this->hasDependencies()) {
-			$result = call_user_func($this->dependencyCheck);
-			if ($result !== true) {
-				if (!is_array($result)) {
-					$result = [$result];
-				}
-				foreach ($result as $key => $value) {
-					if (!($value instanceof MissingDependency)) {
-						$module = null;
-						$message = null;
-						if (is_numeric($key)) {
-							$module = $value;
-						} else {
-							$module = $key;
-							$message = $value;
-						}
-						$value = new MissingDependency($module, $this);
-						$value->setMessage($message);
-					}
-					$ret[] = $value;
-				}
-			}
-		}
-
-		return $ret;
+		return []; // no dependencies by default
 	}
 
 }
diff --git a/apps/files_external/lib/frontenddefinitiontrait.php b/apps/files_external/lib/frontenddefinitiontrait.php
index 4b826372d2f..a5fb1a3f62f 100644
--- a/apps/files_external/lib/frontenddefinitiontrait.php
+++ b/apps/files_external/lib/frontenddefinitiontrait.php
@@ -134,12 +134,12 @@ trait FrontendDefinitionTrait {
 	 * @return bool
 	 */
 	public function validateStorageDefinition(StorageConfig $storage) {
-		$options = $storage->getBackendOptions();
 		foreach ($this->getParameters() as $name => $parameter) {
-			$value = isset($options[$name]) ? $options[$name] : null;
+			$value = $storage->getBackendOption($name);
 			if (!$parameter->validateValue($value)) {
 				return false;
 			}
+			$storage->setBackendOption($name, $value);
 		}
 		return true;
 	}
diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php
index aeca17c4f4c..f3631e53fa1 100644
--- a/apps/files_external/lib/ftp.php
+++ b/apps/files_external/lib/ftp.php
@@ -45,11 +45,7 @@ class FTP extends \OC\Files\Storage\StreamWrapper{
 			$this->user=$params['user'];
 			$this->password=$params['password'];
 			if (isset($params['secure'])) {
-				if (is_string($params['secure'])) {
-					$this->secure = ($params['secure'] === 'true');
-				} else {
-					$this->secure = (bool)$params['secure'];
-				}
+				$this->secure = $params['secure'];
 			} else {
 				$this->secure = false;
 			}
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index e29b1036244..94f954178c0 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -248,8 +248,6 @@ class Google extends \OC\Files\Storage\Common {
 	}
 
 	public function opendir($path) {
-		// Remove leading and trailing slashes
-		$path = trim($path, '/');
 		$folder = $this->getDriveFile($path);
 		if ($folder) {
 			$files = array();
diff --git a/apps/files_external/lib/legacydependencycheckpolyfill.php b/apps/files_external/lib/legacydependencycheckpolyfill.php
new file mode 100644
index 00000000000..7bb137fb3e1
--- /dev/null
+++ b/apps/files_external/lib/legacydependencycheckpolyfill.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_External\Lib;
+
+use \OCA\Files_External\Lib\MissingDependency;
+
+/**
+ * Polyfill for checking dependencies using legacy Storage::checkDependencies()
+ */
+trait LegacyDependencyCheckPolyfill {
+
+	/**
+	 * @return string
+	 */
+	abstract public function getStorageClass();
+
+	/**
+	 * Check if object is valid for use
+	 *
+	 * @return MissingDependency[] Unsatisfied dependencies
+	 */
+	public function checkDependencies() {
+		$ret = [];
+
+		$result = call_user_func([$this->getStorageClass(), 'checkDependencies']);
+		if ($result !== true) {
+			if (!is_array($result)) {
+				$result = [$result];
+			}
+			foreach ($result as $key => $value) {
+				if (!($value instanceof MissingDependency)) {
+					$module = null;
+					$message = null;
+					if (is_numeric($key)) {
+						$module = $value;
+					} else {
+						$module = $key;
+						$message = $value;
+					}
+					$value = new MissingDependency($module, $this);
+					$value->setMessage($message);
+				}
+				$ret[] = $value;
+			}
+		}
+
+		return $ret;
+	}
+
+}
+
diff --git a/apps/files_external/lib/permissionstrait.php b/apps/files_external/lib/permissionstrait.php
new file mode 100644
index 00000000000..8509a01e422
--- /dev/null
+++ b/apps/files_external/lib/permissionstrait.php
@@ -0,0 +1,164 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_External\Lib;
+
+use \OCA\Files_External\Service\BackendService;
+
+/**
+ * Trait to implement backend and auth mechanism permissions
+ *
+ * For user type constants, see BackendService::USER_*
+ * For permission constants, see BackendService::PERMISSION_*
+ */
+trait PermissionsTrait {
+
+	/** @var array [user type => permissions] */
+	protected $permissions = [
+		BackendService::USER_PERSONAL => BackendService::PERMISSION_DEFAULT,
+		BackendService::USER_ADMIN => BackendService::PERMISSION_DEFAULT,
+	];
+
+	/** @var array [user type => allowed permissions] */
+	protected $allowedPermissions = [
+		BackendService::USER_PERSONAL => BackendService::PERMISSION_DEFAULT,
+		BackendService::USER_ADMIN => BackendService::PERMISSION_DEFAULT,
+	];
+
+	/**
+	 * @param string $userType
+	 * @return int
+	 */
+	public function getPermissions($userType) {
+		if (isset($this->permissions[$userType])) {
+			return $this->permissions[$userType];
+		}
+		return BackendService::PERMISSION_NONE;
+	}
+
+	/**
+	 * Check if the user type has permission
+	 *
+	 * @param string $userType
+	 * @param int $permission
+	 * @return bool
+	 */
+	public function isPermitted($userType, $permission) {
+		if ($this->getPermissions($userType) & $permission) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * @param string $userType
+	 * @param int $permissions
+	 * @return self
+	 */
+	public function setPermissions($userType, $permissions) {
+		$this->permissions[$userType] = $permissions;
+		$this->allowedPermissions[$userType] =
+			$this->getAllowedPermissions($userType) | $permissions;
+		return $this;
+	}
+
+	/**
+	 * @param string $userType
+	 * @param int $permission
+	 * @return self
+	 */
+	public function addPermission($userType, $permission) {
+		return $this->setPermissions($userType,
+			$this->getPermissions($userType) | $permission
+		);
+	}
+
+	/**
+	 * @param string $userType
+	 * @param int $permission
+	 * @return self
+	 */
+	public function removePermission($userType, $permission) {
+		return $this->setPermissions($userType,
+			$this->getPermissions($userType) & ~$permission
+		);
+	}
+
+	/**
+	 * @param string $userType
+	 * @return int
+	 */
+	public function getAllowedPermissions($userType) {
+		if (isset($this->allowedPermissions[$userType])) {
+			return $this->allowedPermissions[$userType];
+		}
+		return BackendService::PERMISSION_NONE;
+	}
+
+	/**
+	 * Check if the user type has an allowed permission
+	 *
+	 * @param string $userType
+	 * @param int $permission
+	 * @return bool
+	 */
+	public function isAllowedPermitted($userType, $permission) {
+		if ($this->getAllowedPermissions($userType) & $permission) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * @param string $userType
+	 * @param int $permissions
+	 * @return self
+	 */
+	public function setAllowedPermissions($userType, $permissions) {
+		$this->allowedPermissions[$userType] = $permissions;
+		$this->permissions[$userType] =
+			$this->getPermissions($userType) & $permissions;
+		return $this;
+	}
+
+	/**
+	 * @param string $userType
+	 * @param int $permission
+	 * @return self
+	 */
+	public function addAllowedPermission($userType, $permission) {
+		return $this->setAllowedPermissions($userType,
+			$this->getAllowedPermissions($userType) | $permission
+		);
+	}
+
+	/**
+	 * @param string $userType
+	 * @param int $permission
+	 * @return self
+	 */
+	public function removeAllowedPermission($userType, $permission) {
+		return $this->setAllowedPermissions($userType,
+			$this->getAllowedPermissions($userType) & ~$permission
+		);
+	}
+
+}
diff --git a/apps/files_external/lib/sftp.php b/apps/files_external/lib/sftp.php
index 7f921b5342f..921e7283c66 100644
--- a/apps/files_external/lib/sftp.php
+++ b/apps/files_external/lib/sftp.php
@@ -40,10 +40,11 @@ use phpseclib\Net\SFTP\Stream;
 class SFTP extends \OC\Files\Storage\Common {
 	private $host;
 	private $user;
-	private $password;
 	private $root;
 	private $port = 22;
 
+	private $auth;
+
 	/**
 	* @var SFTP
 	*/
@@ -73,8 +74,15 @@ class SFTP extends \OC\Files\Storage\Common {
 		}
 
 		$this->user = $params['user'];
-		$this->password
-			= isset($params['password']) ? $params['password'] : '';
+
+		if (isset($params['public_key_auth'])) {
+			$this->auth = $params['public_key_auth'];
+		} elseif (isset($params['password'])) {
+			$this->auth = $params['password'];
+		} else {
+			throw new \UnexpectedValueException('no authentication parameters specified');
+		}
+
 		$this->root
 			= isset($params['root']) ? $this->cleanPath($params['root']) : '/';
 
@@ -112,7 +120,7 @@ class SFTP extends \OC\Files\Storage\Common {
 			$this->writeHostKeys($hostKeys);
 		}
 
-		if (!$this->client->login($this->user, $this->password)) {
+		if (!$this->client->login($this->user, $this->auth)) {
 			throw new \Exception('Login failed');
 		}
 		return $this->client;
@@ -125,7 +133,6 @@ class SFTP extends \OC\Files\Storage\Common {
 		if (
 			!isset($this->host)
 			|| !isset($this->user)
-			|| !isset($this->password)
 		) {
 			return false;
 		}
diff --git a/apps/files_external/lib/sftp_key.php b/apps/files_external/lib/sftp_key.php
deleted file mode 100644
index a193b323678..00000000000
--- a/apps/files_external/lib/sftp_key.php
+++ /dev/null
@@ -1,215 +0,0 @@
-<?php
-/**
- * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Ross Nicoll <jrn@jrn.me.uk>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-namespace OC\Files\Storage;
-
-use phpseclib\Crypt\RSA;
-
-class SFTP_Key extends \OC\Files\Storage\SFTP {
-	private $publicKey;
-	private $privateKey;
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function __construct($params) {
-		parent::__construct($params);
-		$this->publicKey = $params['public_key'];
-		$this->privateKey = $params['private_key'];
-	}
-
-	/**
-	 * Returns the connection.
-	 *
-	 * @return \phpseclib\Net\SFTP connected client instance
-	 * @throws \Exception when the connection failed
-	 */
-	public function getConnection() {
-		if (!is_null($this->client)) {
-			return $this->client;
-		}
-
-		$hostKeys = $this->readHostKeys();
-		$this->client = new \phpseclib\Net\SFTP($this->getHost());
-
-		// The SSH Host Key MUST be verified before login().
-		$currentHostKey = $this->client->getServerPublicHostKey();
-		if (array_key_exists($this->getHost(), $hostKeys)) {
-			if ($hostKeys[$this->getHost()] !== $currentHostKey) {
-				throw new \Exception('Host public key does not match known key');
-			}
-		} else {
-			$hostKeys[$this->getHost()] = $currentHostKey;
-			$this->writeHostKeys($hostKeys);
-		}
-
-		$key = $this->getPrivateKey();
-		if (is_null($key)) {
-			throw new \Exception('Secret key could not be loaded');
-		}
-		if (!$this->client->login($this->getUser(), $key)) {
-			throw new \Exception('Login failed');
-		}
-		return $this->client;
-	}
-
-	/**
-	 * Returns the private key to be used for authentication to the remote server.
-	 *
-	 * @return RSA instance or null in case of a failure to load the key.
-	 */
-	private function getPrivateKey() {
-		$key = new RSA();
-		$key->setPassword(\OC::$server->getConfig()->getSystemValue('secret', ''));
-		if (!$key->loadKey($this->privateKey)) {
-			// Should this exception rather than return null?
-			return null;
-		}
-		return $key;
-	}
-
-	/**
-	 * Throws an exception if the provided host name/address is invalid (cannot be resolved
-	 * and is not an IPv4 address).
-	 *
-	 * @return true; never returns in case of a problem, this return value is used just to
-	 * make unit tests happy.
-	 */
-	public function assertHostAddressValid($hostname) {
-		// TODO: Should handle IPv6 addresses too
-		if (!preg_match('/^\d+\.\d+\.\d+\.\d+$/', $hostname) && gethostbyname($hostname) === $hostname) {
-			// Hostname is not an IPv4 address and cannot be resolved via DNS
-			throw new \InvalidArgumentException('Cannot resolve hostname.');
-		}
-		return true;
-	}
-
-	/**
-	 * Throws an exception if the provided port number is invalid (cannot be resolved
-	 * and is not an IPv4 address).
-	 *
-	 * @return true; never returns in case of a problem, this return value is used just to
-	 * make unit tests happy.
-	 */
-	public function assertPortNumberValid($port) {
-		if (!preg_match('/^\d+$/', $port)) {
-			throw new \InvalidArgumentException('Port number must be a number.');
-		}
-		if ($port < 0 || $port > 65535) {
-			throw new \InvalidArgumentException('Port number must be between 0 and 65535 inclusive.');
-		}
-		return true;
-	}
-
-	/**
-	 * Replaces anything that's not an alphanumeric character or "." in a hostname
-	 * with "_", to make it safe for use as part of a file name.
-	 */
-	protected function sanitizeHostName($name) {
-		return preg_replace('/[^\d\w\._]/', '_', $name);
-	}
-
-	/**
-	 * Replaces anything that's not an alphanumeric character or "_" in a username
-	 * with "_", to make it safe for use as part of a file name.
-	 */
-	protected function sanitizeUserName($name) {
-		return preg_replace('/[^\d\w_]/', '_', $name);
-	}
-
-	public function test() {
-
-		// FIXME: Use as expression in empty once PHP 5.4 support is dropped
-		$host = $this->getHost();
-		if (empty($host)) {
-			\OC::$server->getLogger()->warning('Hostname has not been specified');
-			return false;
-		}
-		// FIXME: Use as expression in empty once PHP 5.4 support is dropped
-		$user = $this->getUser();
-		if (empty($user)) {
-			\OC::$server->getLogger()->warning('Username has not been specified');
-			return false;
-		}
-		if (!isset($this->privateKey)) {
-			\OC::$server->getLogger()->warning('Private key was missing from the request');
-			return false;
-		}
-
-		// Sanity check the host
-		$hostParts = explode(':', $this->getHost());
-		try {
-			if (count($hostParts) == 1) {
-				$hostname = $hostParts[0];
-				$this->assertHostAddressValid($hostname);
-			} else if (count($hostParts) == 2) {
-				$hostname = $hostParts[0];
-				$this->assertHostAddressValid($hostname);
-				$this->assertPortNumberValid($hostParts[1]);
-			} else {
-				throw new \Exception('Host connection string is invalid.');
-			}
-		} catch(\Exception $e) {
-			\OC::$server->getLogger()->warning($e->getMessage());
-			return false;
-		}
-
-		// Validate the key
-		$key = $this->getPrivateKey();
-		if (is_null($key)) {
-			\OC::$server->getLogger()->warning('Secret key could not be loaded');
-			return false;
-		}
-
-		try {
-			if ($this->getConnection()->nlist() === false) {
-				return false;
-			}
-		} catch(\Exception $e) {
-			// We should be throwing a more specific error, so we're not just catching
-			// Exception here
-			\OC::$server->getLogger()->warning($e->getMessage());
-			return false;
-		}
-
-		// Save the key somewhere it can easily be extracted later
-		if (\OC::$server->getUserSession()->getUser()) {
-			$view = new \OC\Files\View('/'.\OC::$server->getUserSession()->getUser()->getUId().'/files_external/sftp_keys');
-			if (!$view->is_dir('')) {
-				if (!$view->mkdir('')) {
-					\OC::$server->getLogger()->warning('Could not create secret key directory.');
-					return false;
-				}
-			}
-			$key_filename = $this->sanitizeUserName($this->getUser()).'@'.$this->sanitizeHostName($hostname).'.pub';
-			$key_file = $view->fopen($key_filename, "w");
-			if ($key_file) {
-				fwrite($key_file, $this->publicKey);
-				fclose($key_file);
-			} else {
-				\OC::$server->getLogger()->warning('Could not write secret key file.');
-			}
-		}
-
-		return true;
-	}
-}
diff --git a/apps/files_external/lib/smb_oc.php b/apps/files_external/lib/smb_oc.php
deleted file mode 100644
index 52b73c46ff9..00000000000
--- a/apps/files_external/lib/smb_oc.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/**
- * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <icewind@owncloud.com>
- * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-namespace OC\Files\Storage;
-
-
-use Icewind\SMB\Exception\AccessDeniedException;
-use Icewind\SMB\Exception\Exception;
-use Icewind\SMB\Server;
-
-class SMB_OC extends SMB {
-	private $username_as_share;
-
-	/**
-	 * @param array $params
-	 * @throws \Exception
-	 */
-	public function __construct($params) {
-		if (isset($params['host'])) {
-			$host = $params['host'];
-			$this->username_as_share = ($params['username_as_share'] === 'true');
-
-			// dummy credentials, unused, to satisfy constructor
-			$user = 'foo';
-			$password = 'bar';
-			if (\OC::$server->getSession()->exists('smb-credentials')) {
-				$params_auth = json_decode(\OC::$server->getCrypto()->decrypt(\OC::$server->getSession()->get('smb-credentials')), true);
-				$user = \OC::$server->getSession()->get('loginname');
-				$password = $params_auth['password'];
-			} else {
-				// assume we are testing from the admin section
-			}
-
-			$root = isset($params['root']) ? $params['root'] : '/';
-			$share = '';
-
-			if ($this->username_as_share) {
-				$share = '/' . $user;
-			} elseif (isset($params['share'])) {
-				$share = $params['share'];
-			} else {
-				throw new \Exception();
-			}
-			parent::__construct(array(
-				"user" => $user,
-				"password" => $password,
-				"host" => $host,
-				"share" => $share,
-				"root" => $root
-			));
-		} else {
-			throw new \Exception();
-		}
-	}
-
-
-	/**
-	 * Intercepts the user credentials on login and stores them
-	 * encrypted inside the session if SMB_OC storage is enabled.
-	 * @param array $params
-	 */
-	public static function login($params) {
-		$mountpoints = \OC_Mount_Config::getAbsoluteMountPoints($params['uid']);
-		$mountpointClasses = array();
-		foreach($mountpoints as $mountpoint) {
-			$mountpointClasses[$mountpoint['class']] = true;
-		}
-		if(isset($mountpointClasses['\OC\Files\Storage\SMB_OC'])) {
-			\OC::$server->getSession()->set('smb-credentials', \OC::$server->getCrypto()->encrypt(json_encode($params)));
-		}
-	}
-
-	/**
-	 * @param string $path
-	 * @return boolean
-	 */
-	public function isSharable($path) {
-		return false;
-	}
-
-	/**
-	 * @param bool $isPersonal
-	 * @return bool
-	 */
-	public function test($isPersonal = true) {
-		if ($isPersonal) {
-			if ($this->stat('')) {
-				return true;
-			}
-			return false;
-		} else {
-			$server = new Server($this->server->getHost(), '', '');
-
-			try {
-				$server->listShares();
-				return true;
-			} catch (AccessDeniedException $e) {
-				// expected due to anonymous login
-				return true;
-			} catch (Exception $e) {
-				return false;
-			}
-		}
-	}
-}
diff --git a/apps/files_external/lib/visibilitytrait.php b/apps/files_external/lib/visibilitytrait.php
deleted file mode 100644
index dfd2d323ca6..00000000000
--- a/apps/files_external/lib/visibilitytrait.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-/**
- * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-namespace OCA\Files_External\Lib;
-
-use \OCA\Files_External\Service\BackendService;
-
-/**
- * Trait to implement visibility mechanics for a configuration class
- *
- * The standard visibility defines which users/groups can use or see the
- * object. The allowed visibility defines the maximum visibility allowed to be
- * set on the object. The standard visibility is often set dynamically by
- * stored configuration parameters that can be modified by the administrator,
- * while the allowed visibility is set directly by the object and cannot be
- * modified by the administrator.
- */
-trait VisibilityTrait {
-
-	/** @var int visibility */
-	protected $visibility = BackendService::VISIBILITY_DEFAULT;
-
-	/** @var int allowed visibilities */
-	protected $allowedVisibility = BackendService::VISIBILITY_DEFAULT;
-
-	/**
-	 * @return int
-	 */
-	public function getVisibility() {
-		return $this->visibility;
-	}
-
-	/**
-	 * Check if the backend is visible for a user type
-	 *
-	 * @param int $visibility
-	 * @return bool
-	 */
-	public function isVisibleFor($visibility) {
-		if ($this->visibility & $visibility) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @param int $visibility
-	 * @return self
-	 */
-	public function setVisibility($visibility) {
-		$this->visibility = $visibility;
-		$this->allowedVisibility |= $visibility;
-		return $this;
-	}
-
-	/**
-	 * @param int $visibility
-	 * @return self
-	 */
-	public function addVisibility($visibility) {
-		return $this->setVisibility($this->visibility | $visibility);
-	}
-
-	/**
-	 * @param int $visibility
-	 * @return self
-	 */
-	public function removeVisibility($visibility) {
-		return $this->setVisibility($this->visibility & ~$visibility);
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getAllowedVisibility() {
-		return $this->allowedVisibility;
-	}
-
-	/**
-	 * Check if the backend is allowed to be visible for a user type
-	 *
-	 * @param int $allowedVisibility
-	 * @return bool
-	 */
-	public function isAllowedVisibleFor($allowedVisibility) {
-		if ($this->allowedVisibility & $allowedVisibility) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @param int $allowedVisibility
-	 * @return self
-	 */
-	public function setAllowedVisibility($allowedVisibility) {
-		$this->allowedVisibility = $allowedVisibility;
-		$this->visibility &= $allowedVisibility;
-		return $this;
-	}
-
-	/**
-	 * @param int $allowedVisibility
-	 * @return self
-	 */
-	public function addAllowedVisibility($allowedVisibility) {
-		return $this->setAllowedVisibility($this->allowedVisibility | $allowedVisibility);
-	}
-
-	/**
-	 * @param int $allowedVisibility
-	 * @return self
-	 */
-	public function removeAllowedVisibility($allowedVisibility) {
-		return $this->setAllowedVisibility($this->allowedVisibility & ~$allowedVisibility);
-	}
-
-}
diff --git a/apps/files_external/personal.php b/apps/files_external/personal.php
index 8717d91d4f1..d47f983b357 100644
--- a/apps/files_external/personal.php
+++ b/apps/files_external/personal.php
@@ -34,8 +34,12 @@ $userStoragesService = $appContainer->query('OCA\Files_external\Service\UserStor
 OCP\Util::addScript('files_external', 'settings');
 OCP\Util::addStyle('files_external', 'settings');
 
-$backends = $backendService->getBackendsVisibleFor(BackendService::VISIBILITY_PERSONAL);
-$authMechanisms = $backendService->getAuthMechanismsVisibleFor(BackendService::VISIBILITY_PERSONAL);
+$backends = array_filter($backendService->getAvailableBackends(), function($backend) {
+	return $backend->isPermitted(BackendService::USER_PERSONAL, BackendService::PERMISSION_CREATE);
+});
+$authMechanisms = array_filter($backendService->getAuthMechanisms(), function($authMechanism) {
+	return $authMechanism->isPermitted(BackendService::USER_PERSONAL, BackendService::PERMISSION_CREATE);
+});
 foreach ($backends as $backend) {
 	if ($backend->getCustomJs()) {
 		\OCP\Util::addScript('files_external', $backend->getCustomJs());
diff --git a/apps/files_external/service/backendservice.php b/apps/files_external/service/backendservice.php
index 382834b4c19..70cb9291660 100644
--- a/apps/files_external/service/backendservice.php
+++ b/apps/files_external/service/backendservice.php
@@ -31,13 +31,17 @@ use \OCA\Files_External\Lib\Auth\AuthMechanism;
  */
 class BackendService {
 
-	/** Visibility constants for VisibilityTrait */
-	const VISIBILITY_NONE = 0;
-	const VISIBILITY_PERSONAL = 1;
-	const VISIBILITY_ADMIN = 2;
-	//const VISIBILITY_ALIENS = 4;
+	/** Permission constants for PermissionsTrait */
+	const PERMISSION_NONE = 0;
+	const PERMISSION_MOUNT = 1;
+	const PERMISSION_CREATE = 2;
+	const PERMISSION_MODIFY = 4;
 
-	const VISIBILITY_DEFAULT = 3; // PERSONAL | ADMIN
+	const PERMISSION_DEFAULT = 7; // MOUNT | CREATE | MODIFY
+
+	/** User contants */
+	const USER_ADMIN = 'admin';
+	const USER_PERSONAL = 'personal';
 
 	/** Priority constants for PriorityTrait */
 	const PRIORITY_DEFAULT = 100;
@@ -81,7 +85,7 @@ class BackendService {
 	 */
 	public function registerBackend(Backend $backend) {
 		if (!$this->isAllowedUserBackend($backend)) {
-			$backend->removeVisibility(BackendService::VISIBILITY_PERSONAL);
+			$backend->removePermission(self::USER_PERSONAL, self::PERMISSION_CREATE | self::PERMISSION_MOUNT);
 		}
 		foreach ($backend->getIdentifierAliases() as $alias) {
 			$this->backends[$alias] = $backend;
@@ -103,7 +107,7 @@ class BackendService {
 	 */
 	public function registerAuthMechanism(AuthMechanism $authMech) {
 		if (!$this->isAllowedAuthMechanism($authMech)) {
-			$authMech->removeVisibility(BackendService::VISIBILITY_PERSONAL);
+			$authMech->removePermission(self::USER_PERSONAL, self::PERMISSION_CREATE | self::PERMISSION_MOUNT);
 		}
 		foreach ($authMech->getIdentifierAliases() as $alias) {
 			$this->authMechanisms[$alias] = $authMech;
@@ -145,30 +149,6 @@ class BackendService {
 	}
 
 	/**
-	 * Get backends visible for $visibleFor
-	 *
-	 * @param int $visibleFor
-	 * @return Backend[]
-	 */
-	public function getBackendsVisibleFor($visibleFor) {
-		return array_filter($this->getAvailableBackends(), function($backend) use ($visibleFor) {
-			return $backend->isVisibleFor($visibleFor);
-		});
-	}
-
-	/**
-	 * Get backends allowed to be visible for $visibleFor
-	 *
-	 * @param int $visibleFor
-	 * @return Backend[]
-	 */
-	public function getBackendsAllowedVisibleFor($visibleFor) {
-		return array_filter($this->getAvailableBackends(), function($backend) use ($visibleFor) {
-			return $backend->isAllowedVisibleFor($visibleFor);
-		});
-	}
-
-	/**
 	 * @param string $identifier
 	 * @return Backend|null
 	 */
@@ -206,31 +186,6 @@ class BackendService {
 	}
 
 	/**
-	 * Get authentication mechanisms visible for $visibleFor
-	 *
-	 * @param int $visibleFor
-	 * @return AuthMechanism[]
-	 */
-	public function getAuthMechanismsVisibleFor($visibleFor) {
-		return array_filter($this->getAuthMechanisms(), function($authMechanism) use ($visibleFor) {
-			return $authMechanism->isVisibleFor($visibleFor);
-		});
-	}
-
-	/**
-	 * Get authentication mechanisms allowed to be visible for $visibleFor
-	 *
-	 * @param int $visibleFor
-	 * @return AuthMechanism[]
-	 */
-	public function getAuthMechanismsAllowedVisibleFor($visibleFor) {
-		return array_filter($this->getAuthMechanisms(), function($authMechanism) use ($visibleFor) {
-			return $authMechanism->isAllowedVisibleFor($visibleFor);
-		});
-	}
-
-
-	/**
 	 * @param string $identifier
 	 * @return AuthMechanism|null
 	 */
diff --git a/apps/files_external/service/storagesservice.php b/apps/files_external/service/storagesservice.php
index 282ac8f2db1..703f277d84e 100644
--- a/apps/files_external/service/storagesservice.php
+++ b/apps/files_external/service/storagesservice.php
@@ -118,6 +118,8 @@ abstract class StoragesService {
 			$applicableGroups[] = $applicable;
 			$storageConfig->setApplicableGroups($applicableGroups);
 		}
+
+
 		return $storageConfig;
 	}
 
@@ -170,7 +172,7 @@ abstract class StoragesService {
 
 					// the root mount point is in the format "/$user/files/the/mount/point"
 					// we remove the "/$user/files" prefix
-					$parts = explode('/', trim($rootMountPath, '/'), 3);
+					$parts = explode('/', ltrim($rootMountPath, '/'), 3);
 					if (count($parts) < 3) {
 						// something went wrong, skip
 						\OCP\Util::writeLog(
@@ -181,7 +183,7 @@ abstract class StoragesService {
 						continue;
 					}
 
-					$relativeMountPath = $parts[2];
+					$relativeMountPath = rtrim($parts[2], '/');
 
 					// note: we cannot do this after the loop because the decrypted config
 					// options might be needed for the config hash
@@ -238,6 +240,12 @@ abstract class StoragesService {
 			$this->setRealStorageIds($storages, $storagesWithConfigHash);
 		}
 
+		// convert parameter values
+		foreach ($storages as $storage) {
+			$storage->getBackend()->validateStorageDefinition($storage);
+			$storage->getAuthMechanism()->validateStorageDefinition($storage);
+		}
+
 		return $storages;
 	}
 
@@ -464,10 +472,14 @@ abstract class StoragesService {
 		if (!isset($allStorages[$id])) {
 			throw new NotFoundException('Storage with id "' . $id . '" not found');
 		}
-
 		$oldStorage = $allStorages[$id];
-		$allStorages[$id] = $updatedStorage;
 
+		// ensure objectstore is persistent
+		if ($objectstore = $oldStorage->getBackendOption('objectstore')) {
+			$updatedStorage->setBackendOption('objectstore', $objectstore);
+		}
+
+		$allStorages[$id] = $updatedStorage;
 		$this->writeConfig($allStorages);
 
 		$this->triggerChangeHooks($oldStorage, $updatedStorage);
diff --git a/apps/files_external/service/userglobalstoragesservice.php b/apps/files_external/service/userglobalstoragesservice.php
index 78520419556..c59652d057f 100644
--- a/apps/files_external/service/userglobalstoragesservice.php
+++ b/apps/files_external/service/userglobalstoragesservice.php
@@ -76,20 +76,25 @@ class UserGlobalStoragesService extends GlobalStoragesService {
 		$data = parent::readLegacyConfig();
 		$userId = $this->getUser()->getUID();
 
+		// don't use array_filter() with ARRAY_FILTER_USE_KEY, it's PHP 5.6+
 		if (isset($data[\OC_Mount_Config::MOUNT_TYPE_USER])) {
-			$data[\OC_Mount_Config::MOUNT_TYPE_USER] = array_filter(
-				$data[\OC_Mount_Config::MOUNT_TYPE_USER], function($key) use ($userId) {
-					return (strtolower($key) === strtolower($userId) || $key === 'all');
-				}, ARRAY_FILTER_USE_KEY
-			);
+			$newData = [];
+			foreach ($data[\OC_Mount_Config::MOUNT_TYPE_USER] as $key => $value) {
+				if (strtolower($key) === strtolower($userId) || $key === 'all') {
+					$newData[$key] = $value;
+				}
+			}
+			$data[\OC_Mount_Config::MOUNT_TYPE_USER] = $newData;
 		}
 
 		if (isset($data[\OC_Mount_Config::MOUNT_TYPE_GROUP])) {
-			$data[\OC_Mount_Config::MOUNT_TYPE_GROUP] = array_filter(
-				$data[\OC_Mount_Config::MOUNT_TYPE_GROUP], function($key) use ($userId) {
-					return ($this->groupManager->isInGroup($userId, $key));
-				}, ARRAY_FILTER_USE_KEY
-			);
+			$newData = [];
+			foreach ($data[\OC_Mount_Config::MOUNT_TYPE_GROUP] as $key => $value) {
+				if ($this->groupManager->isInGroup($userId, $key)) {
+					$newData[$key] = $value;
+				}
+			}
+			$data[\OC_Mount_Config::MOUNT_TYPE_GROUP] = $newData;
 		}
 
 		return $data;
diff --git a/apps/files_external/settings.php b/apps/files_external/settings.php
index 29c0553158f..840f1325fb5 100644
--- a/apps/files_external/settings.php
+++ b/apps/files_external/settings.php
@@ -41,8 +41,12 @@ OCP\Util::addStyle('files_external', 'settings');
 \OC_Util::addVendorScript('select2/select2');
 \OC_Util::addVendorStyle('select2/select2');
 
-$backends = $backendService->getBackendsVisibleFor(BackendService::VISIBILITY_ADMIN);
-$authMechanisms = $backendService->getAuthMechanismsVisibleFor(BackendService::VISIBILITY_ADMIN);
+$backends = array_filter($backendService->getAvailableBackends(), function($backend) {
+	return $backend->isPermitted(BackendService::USER_ADMIN, BackendService::PERMISSION_CREATE);
+});
+$authMechanisms = array_filter($backendService->getAuthMechanisms(), function($authMechanism) {
+	return $authMechanism->isPermitted(BackendService::USER_ADMIN, BackendService::PERMISSION_CREATE);
+});
 foreach ($backends as $backend) {
 	if ($backend->getCustomJs()) {
 		\OCP\Util::addScript('files_external', $backend->getCustomJs());
@@ -54,13 +58,19 @@ foreach ($authMechanisms as $authMechanism) {
 	}
 }
 
+$userBackends = array_filter($backendService->getAvailableBackends(), function($backend) {
+	return $backend->isAllowedPermitted(
+		BackendService::USER_PERSONAL, BackendService::PERMISSION_MOUNT
+	);
+});
+
 $tmpl = new OCP\Template('files_external', 'settings');
 $tmpl->assign('encryptionEnabled', \OC::$server->getEncryptionManager()->isEnabled());
 $tmpl->assign('isAdminPage', true);
 $tmpl->assign('storages', $globalStoragesService->getAllStorages());
 $tmpl->assign('backends', $backends);
 $tmpl->assign('authMechanisms', $authMechanisms);
-$tmpl->assign('userBackends', $backendService->getBackendsAllowedVisibleFor(BackendService::VISIBILITY_PERSONAL));
+$tmpl->assign('userBackends', $userBackends);
 $tmpl->assign('dependencies', OC_Mount_Config::dependencyMessage($backendService->getBackends()));
 $tmpl->assign('allowUserMounting', $backendService->isUserMountingAllowed());
 return $tmpl->fetchPage();
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 611c5807a5f..63a3a19de2f 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -27,7 +27,7 @@
 				<input type="checkbox"
 					<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
 					data-parameter="<?php p($parameter->getName()); ?>"
-				 	<?php if ($value == 'true'): ?> checked="checked"<?php endif; ?>
+				 	<?php if ($value === true): ?> checked="checked"<?php endif; ?>
 				/>
 				<?php p($placeholder); ?>
 			</label>
@@ -197,7 +197,7 @@
 		<p id="userMountingBackends"<?php if ($_['allowUserMounting'] != 'yes'): ?> class="hidden"<?php endif; ?>>
 			<?php p($l->t('Allow users to mount the following external storage')); ?><br />
 			<?php $i = 0; foreach ($_['userBackends'] as $backend): ?>
-				<input type="checkbox" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) print_unescaped(' checked="checked"'); ?> />
+				<input type="checkbox" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isPermitted(BackendService::USER_PERSONAL, BackendService::PERMISSION_MOUNT)) print_unescaped(' checked="checked"'); ?> />
 				<label for="allowUserMountingBackends<?php p($i); ?>"><?php p($backend->getText()); ?></label> <br />
 				<?php $i++; ?>
 			<?php endforeach; ?>
diff --git a/apps/files_external/tests/backend/legacybackendtest.php b/apps/files_external/tests/backend/legacybackendtest.php
index 44cb16a4986..d57810de29b 100644
--- a/apps/files_external/tests/backend/legacybackendtest.php
+++ b/apps/files_external/tests/backend/legacybackendtest.php
@@ -23,15 +23,25 @@ namespace OCA\Files_External\Tests\Backend;
 
 use \OCA\Files_External\Lib\Backend\LegacyBackend;
 use \OCA\Files_External\Lib\DefinitionParameter;
+use \OCA\Files_External\Lib\MissingDependency;
 
 class LegacyBackendTest extends \Test\TestCase {
 
+	/**
+	 * @return MissingDependency[]
+	 */
+	public static function checkDependencies() {
+		return [
+			(new MissingDependency('abc'))->setMessage('foobar')
+		];
+	}
+
 	public function testConstructor() {
 		$auth = $this->getMockBuilder('\OCA\Files_External\Lib\Auth\Builtin')
 			->disableOriginalConstructor()
 			->getMock();
 
-		$class = '\OC\Files\Storage\SMB';
+		$class = '\OCA\Files_External\Tests\Backend\LegacyBackendTest';
 		$definition = [
 			'configuration' => [
 				'textfield' => 'Text field',
@@ -49,14 +59,18 @@ class LegacyBackendTest extends \Test\TestCase {
 
 		$backend = new LegacyBackend($class, $definition, $auth);
 
-		$this->assertEquals('\OC\Files\Storage\SMB', $backend->getStorageClass());
+		$this->assertEquals('\OCA\Files_External\Tests\Backend\LegacyBackendTest', $backend->getStorageClass());
 		$this->assertEquals('Backend text', $backend->getText());
 		$this->assertEquals(123, $backend->getPriority());
 		$this->assertEquals('foo/bar.js', $backend->getCustomJs());
-		$this->assertEquals(true, $backend->hasDependencies());
 		$this->assertArrayHasKey('builtin', $backend->getAuthSchemes());
 		$this->assertEquals($auth, $backend->getLegacyAuthMechanism());
 
+		$dependencies = $backend->checkDependencies();
+		$this->assertCount(1, $dependencies);
+		$this->assertEquals('abc', $dependencies[0]->getDependency());
+		$this->assertEquals('foobar', $dependencies[0]->getMessage());
+
 		$parameters = $backend->getParameters();
 		$this->assertEquals('Text field', $parameters['textfield']->getText());
 		$this->assertEquals(DefinitionParameter::VALUE_TEXT, $parameters['textfield']->getType());
@@ -78,4 +92,22 @@ class LegacyBackendTest extends \Test\TestCase {
 		$this->assertEquals(DefinitionParameter::FLAG_OPTIONAL, $parameters['optionalpassword']->getFlags());
 	}
 
+	public function testNoDependencies() {
+		$auth = $this->getMockBuilder('\OCA\Files_External\Lib\Auth\Builtin')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$class = '\OCA\Files_External\Tests\Backend\LegacyBackendTest';
+		$definition = [
+			'configuration' => [
+			],
+			'backend' => 'Backend text',
+		];
+
+		$backend = new LegacyBackend($class, $definition, $auth);
+
+		$dependencies = $backend->checkDependencies();
+		$this->assertCount(0, $dependencies);
+	}
+
 }
diff --git a/apps/files_external/tests/controller/storagescontrollertest.php b/apps/files_external/tests/controller/storagescontrollertest.php
index 2b0ee7a14ea..c43761f3bcb 100644
--- a/apps/files_external/tests/controller/storagescontrollertest.php
+++ b/apps/files_external/tests/controller/storagescontrollertest.php
@@ -75,10 +75,12 @@ abstract class StoragesControllerTest extends \Test\TestCase {
 		$authMech = $this->getAuthMechMock();
 		$authMech->method('validateStorage')
 			->willReturn(true);
+		$authMech->method('isPermitted')
+			->willReturn(true);
 		$backend = $this->getBackendMock();
 		$backend->method('validateStorage')
 			->willReturn(true);
-		$backend->method('isVisibleFor')
+		$backend->method('isPermitted')
 			->willReturn(true);
 
 		$storageConfig = new StorageConfig(1);
@@ -114,10 +116,12 @@ abstract class StoragesControllerTest extends \Test\TestCase {
 		$authMech = $this->getAuthMechMock();
 		$authMech->method('validateStorage')
 			->willReturn(true);
+		$authMech->method('isPermitted')
+			->willReturn(true);
 		$backend = $this->getBackendMock();
 		$backend->method('validateStorage')
 			->willReturn(true);
-		$backend->method('isVisibleFor')
+		$backend->method('isPermitted')
 			->willReturn(true);
 
 		$storageConfig = new StorageConfig(1);
@@ -245,10 +249,12 @@ abstract class StoragesControllerTest extends \Test\TestCase {
 		$authMech = $this->getAuthMechMock();
 		$authMech->method('validateStorage')
 			->willReturn(true);
+		$authMech->method('isPermitted')
+			->willReturn(true);
 		$backend = $this->getBackendMock();
 		$backend->method('validateStorage')
 			->willReturn(true);
-		$backend->method('isVisibleFor')
+		$backend->method('isPermitted')
 			->willReturn(true);
 
 		$storageConfig = new StorageConfig(255);
@@ -332,12 +338,14 @@ abstract class StoragesControllerTest extends \Test\TestCase {
 		$backend = $this->getBackendMock();
 		$backend->method('validateStorage')
 			->willReturn($backendValidate);
-		$backend->method('isVisibleFor')
+		$backend->method('isPermitted')
 			->willReturn(true);
 
 		$authMech = $this->getAuthMechMock();
 		$authMech->method('validateStorage')
 			->will($this->returnValue($authMechValidate));
+		$authMech->method('isPermitted')
+			->willReturn(true);
 
 		$storageConfig = new StorageConfig();
 		$storageConfig->setMountPoint('mount');
diff --git a/apps/files_external/tests/controller/userstoragescontrollertest.php b/apps/files_external/tests/controller/userstoragescontrollertest.php
index 9f1a8df8d2e..b61174b0797 100644
--- a/apps/files_external/tests/controller/userstoragescontrollertest.php
+++ b/apps/files_external/tests/controller/userstoragescontrollertest.php
@@ -49,15 +49,21 @@ class UserStoragesControllerTest extends StoragesControllerTest {
 	}
 
 	public function testAddOrUpdateStorageDisallowedBackend() {
-		$backend = $this->getBackendMock();
-		$backend->method('isVisibleFor')
-			->with(BackendService::VISIBILITY_PERSONAL)
+		$backend1 = $this->getBackendMock();
+		$backend1->expects($this->once())
+			->method('isPermitted')
+			->with(BackendService::USER_PERSONAL, BackendService::PERMISSION_CREATE)
+			->willReturn(false);
+		$backend2 = $this->getBackendMock();
+		$backend2->expects($this->once())
+			->method('isPermitted')
+			->with(BackendService::USER_PERSONAL, BackendService::PERMISSION_MODIFY)
 			->willReturn(false);
 		$authMech = $this->getAuthMechMock();
 
 		$storageConfig = new StorageConfig(1);
 		$storageConfig->setMountPoint('mount');
-		$storageConfig->setBackend($backend);
+		$storageConfig->setBackend($backend1);
 		$storageConfig->setAuthMechanism($authMech);
 		$storageConfig->setBackendOptions([]);
 
@@ -82,6 +88,8 @@ class UserStoragesControllerTest extends StoragesControllerTest {
 
 		$this->assertEquals(Http::STATUS_UNPROCESSABLE_ENTITY, $response->getStatus());
 
+		$storageConfig->setBackend($backend2);
+
 		$response = $this->controller->update(
 			1,
 			'mount',
diff --git a/apps/files_external/tests/definitionparameterttest.php b/apps/files_external/tests/definitionparameterttest.php
index 6be00508698..22e0b842254 100644
--- a/apps/files_external/tests/definitionparameterttest.php
+++ b/apps/files_external/tests/definitionparameterttest.php
@@ -49,6 +49,9 @@ class DefinitionParameterTest extends \Test\TestCase {
 
 			[Param::VALUE_BOOLEAN, Param::FLAG_NONE, false, true],
 			[Param::VALUE_BOOLEAN, Param::FLAG_NONE, 123, false],
+			// conversion from string to boolean
+			[Param::VALUE_BOOLEAN, Param::FLAG_NONE, 'false', true, false],
+			[Param::VALUE_BOOLEAN, Param::FLAG_NONE, 'true', true, true],
 
 			[Param::VALUE_PASSWORD, Param::FLAG_NONE, 'foobar', true],
 			[Param::VALUE_PASSWORD, Param::FLAG_NONE, '', false],
@@ -60,11 +63,14 @@ class DefinitionParameterTest extends \Test\TestCase {
 	/**
 	 * @dataProvider validateValueProvider
 	 */
-	public function testValidateValue($type, $flags, $value, $success) {
+	public function testValidateValue($type, $flags, $value, $success, $expectedValue = null) {
 		$param = new Param('foo', 'bar');
 		$param->setType($type);
 		$param->setFlags($flags);
 
 		$this->assertEquals($success, $param->validateValue($value));
+		if (isset($expectedValue)) {
+			$this->assertEquals($expectedValue, $value);
+		}
 	}
 }
diff --git a/apps/files_external/tests/frontenddefinitiontraittest.php b/apps/files_external/tests/frontenddefinitiontraittest.php
index 871a87d4c52..d92d02b9854 100644
--- a/apps/files_external/tests/frontenddefinitiontraittest.php
+++ b/apps/files_external/tests/frontenddefinitiontraittest.php
@@ -70,9 +70,11 @@ class FrontendDefinitionTraitTest extends \Test\TestCase {
 		$storageConfig = $this->getMockBuilder('\OCA\Files_External\Lib\StorageConfig')
 			->disableOriginalConstructor()
 			->getMock();
-		$storageConfig->expects($this->once())
-			->method('getBackendOptions')
-			->willReturn([]);
+		$storageConfig->expects($this->any())
+			->method('getBackendOption')
+			->willReturn(null);
+		$storageConfig->expects($this->any())
+			->method('setBackendOption');
 
 		$trait = $this->getMockForTrait('\OCA\Files_External\Lib\FrontendDefinitionTrait');
 		$trait->setText('test');
@@ -80,4 +82,35 @@ class FrontendDefinitionTraitTest extends \Test\TestCase {
 
 		$this->assertEquals($expectedSuccess, $trait->validateStorageDefinition($storageConfig));
 	}
+
+	public function testValidateStorageSet() {
+		$param = $this->getMockBuilder('\OCA\Files_External\Lib\DefinitionParameter')
+			->disableOriginalConstructor()
+			->getMock();
+		$param->method('getName')
+			->willReturn('param');
+		$param->expects($this->once())
+			->method('validateValue')
+			->will($this->returnCallback(function(&$value) {
+				$value = 'foobar';
+				return true;
+			}));
+
+		$storageConfig = $this->getMockBuilder('\OCA\Files_External\Lib\StorageConfig')
+			->disableOriginalConstructor()
+			->getMock();
+		$storageConfig->expects($this->once())
+			->method('getBackendOption')
+			->with('param')
+			->willReturn('barfoo');
+		$storageConfig->expects($this->once())
+			->method('setBackendOption')
+			->with('param', 'foobar');
+
+		$trait = $this->getMockForTrait('\OCA\Files_External\Lib\FrontendDefinitionTrait');
+		$trait->setText('test');
+		$trait->addParameter($param);
+
+		$this->assertEquals(true, $trait->validateStorageDefinition($storageConfig));
+	}
 }
diff --git a/apps/files_external/tests/dependencytraittest.php b/apps/files_external/tests/legacydependencycheckpolyfilltest.php
index 5706d97053d..49d825d77aa 100644
--- a/apps/files_external/tests/dependencytraittest.php
+++ b/apps/files_external/tests/legacydependencycheckpolyfilltest.php
@@ -23,16 +23,23 @@ namespace OCA\Files_External\Tests;
 
 use \OCA\Files_External\Lib\MissingDependency;
 
-class DependencyTraitTest extends \Test\TestCase {
+class LegacyDependencyCheckPolyfillTest extends \Test\TestCase {
+
+	/**
+	 * @return MissingDependency[]
+	 */
+	public static function checkDependencies() {
+		return [
+			(new MissingDependency('dependency'))->setMessage('missing dependency'),
+			(new MissingDependency('program'))->setMessage('cannot find program'),
+		];
+	}
 
 	public function testCheckDependencies() {
-		$trait = $this->getMockForTrait('\OCA\Files_External\Lib\DependencyTrait');
-		$trait->setDependencyCheck(function() {
-			return [
-				(new MissingDependency('dependency'))->setMessage('missing dependency'),
-				(new MissingDependency('program'))->setMessage('cannot find program'),
-			];
-		});
+		$trait = $this->getMockForTrait('\OCA\Files_External\Lib\LegacyDependencyCheckPolyfill');
+		$trait->expects($this->once())
+			->method('getStorageClass')
+			->willReturn('\OCA\Files_External\Tests\LegacyDependencyCheckPolyfillTest');
 
 		$dependencies = $trait->checkDependencies();
 		$this->assertCount(2, $dependencies);
diff --git a/apps/files_external/tests/service/backendservicetest.php b/apps/files_external/tests/service/backendservicetest.php
index 08f6b9bf988..b37b5e9b466 100644
--- a/apps/files_external/tests/service/backendservicetest.php
+++ b/apps/files_external/tests/service/backendservicetest.php
@@ -83,11 +83,11 @@ class BackendServiceTest extends \Test\TestCase {
 
 		$backendAllowed = $this->getBackendMock('\User\Mount\Allowed');
 		$backendAllowed->expects($this->never())
-			->method('removeVisibility');
+			->method('removePermission');
 		$backendNotAllowed = $this->getBackendMock('\User\Mount\NotAllowed');
 		$backendNotAllowed->expects($this->once())
-			->method('removeVisibility')
-			->with(BackendService::VISIBILITY_PERSONAL);
+			->method('removePermission')
+			->with(BackendService::USER_PERSONAL, BackendService::PERMISSION_CREATE | BackendService::PERMISSION_MOUNT);
 
 		$backendAlias = $this->getMockBuilder('\OCA\Files_External\Lib\Backend\Backend')
 			->disableOriginalConstructor()
@@ -126,27 +126,5 @@ class BackendServiceTest extends \Test\TestCase {
 		$this->assertArrayNotHasKey('identifier:\Backend\NotAvailable', $availableBackends);
 	}
 
-	public function testGetUserBackends() {
-		$service = new BackendService($this->config, $this->l10n);
-
-		$backendAllowed = $this->getBackendMock('\User\Mount\Allowed');
-		$backendAllowed->expects($this->once())
-			->method('isVisibleFor')
-			->with(BackendService::VISIBILITY_PERSONAL)
-			->will($this->returnValue(true));
-		$backendNotAllowed = $this->getBackendMock('\User\Mount\NotAllowed');
-		$backendNotAllowed->expects($this->once())
-			->method('isVisibleFor')
-			->with(BackendService::VISIBILITY_PERSONAL)
-			->will($this->returnValue(false));
-
-		$service->registerBackend($backendAllowed);
-		$service->registerBackend($backendNotAllowed);
-
-		$userBackends = $service->getBackendsVisibleFor(BackendService::VISIBILITY_PERSONAL);
-		$this->assertArrayHasKey('identifier:\User\Mount\Allowed', $userBackends);
-		$this->assertArrayNotHasKey('identifier:\User\Mount\NotAllowed', $userBackends);
-	}
-
 }
 
diff --git a/apps/files_external/tests/service/globalstoragesservicetest.php b/apps/files_external/tests/service/globalstoragesservicetest.php
index 05585d2c065..94c34c221fc 100644
--- a/apps/files_external/tests/service/globalstoragesservicetest.php
+++ b/apps/files_external/tests/service/globalstoragesservicetest.php
@@ -789,6 +789,13 @@ class GlobalStoragesServiceTest extends StoragesServiceTest {
 
 		file_put_contents($configFile, json_encode($json));
 
+		$this->backendService->getBackend('identifier:\OCA\Files_External\Lib\Backend\SMB')
+			->expects($this->exactly(4))
+			->method('validateStorageDefinition');
+		$this->backendService->getAuthMechanism('identifier:\Auth\Mechanism')
+			->expects($this->exactly(4))
+			->method('validateStorageDefinition');
+
 		$allStorages = $this->service->getAllStorages();
 
 		$this->assertCount(4, $allStorages);
@@ -907,4 +914,32 @@ class GlobalStoragesServiceTest extends StoragesServiceTest {
 		$this->assertEquals('identifier:\Auth\Mechanism', $storage2->getAuthMechanism()->getIdentifier());
 	}
 
+	public function testReadEmptyMountPoint() {
+		$configFile = $this->dataDir . '/mount.json';
+
+		$json = [
+			'user' => [
+				'user1' => [
+					'/$user/files/' => [
+						'backend' => 'identifier:\OCA\Files_External\Lib\Backend\SFTP',
+						'authMechanism' => 'identifier:\Auth\Mechanism',
+						'options' => [],
+						'mountOptions' => [],
+					],
+				]
+			]
+		];
+
+		file_put_contents($configFile, json_encode($json));
+
+		$allStorages = $this->service->getAllStorages();
+
+		$this->assertCount(1, $allStorages);
+
+		$storage1 = $allStorages[1];
+
+		$this->assertEquals('/', $storage1->getMountPoint());
+	}
+
+
 }
diff --git a/apps/files_external/tests/service/userglobalstoragesservicetest.php b/apps/files_external/tests/service/userglobalstoragesservicetest.php
index 49a02453840..b9e2c08c932 100644
--- a/apps/files_external/tests/service/userglobalstoragesservicetest.php
+++ b/apps/files_external/tests/service/userglobalstoragesservicetest.php
@@ -212,4 +212,9 @@ class UserGlobalStoragesServiceTest extends GlobalStoragesServiceTest {
 		$this->assertTrue(true);
 	}
 
+	public function testReadEmptyMountPoint() {
+		// we don't test this here
+		$this->assertTrue(true);
+	}
+
 }