Merge branch 'master' into sync-master

68 files changed, 837 insertions, 75 deletions

diff --git a/apps/files_external/appinfo/routes.php b/apps/files_external/appinfo/routes.php
index 68924ba2c6b..1062ae524ff 100644
--- a/apps/files_external/appinfo/routes.php
+++ b/apps/files_external/appinfo/routes.php
@@ -42,7 +42,12 @@
 				'url' => '/ajax/public_key.php',
 				'verb' => 'POST',
 				'requirements' => array()
-			)
+			),
+			[
+				'name' => 'Ajax#saveGlobalCredentials',
+				'url' => '/globalcredentials',
+				'verb' => 'POST',
+			],
 		)
 	)
 );
diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index d210c158ec1..921bf92e775 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -1347,6 +1347,33 @@ $(document).ready(function() {
 		}
 	});
 
+	$('#global_credentials').on('submit', function() {
+		var $form = $(this);
+		var uid = $form.find('[name=uid]').val();
+		var user = $form.find('[name=username]').val();
+		var password = $form.find('[name=password]').val();
+		var $submit = $form.find('[type=submit]');
+		$submit.val(t('files_external', 'Saving...'));
+		$.ajax({
+			type: 'POST',
+			contentType: 'application/json',
+			data: JSON.stringify({
+					uid: uid,
+					user: user,
+				password: password
+			}),
+				url: OC.generateUrl('apps/files_external/globalcredentials'),
+				dataType: 'json',
+			success: function() {
+				$submit.val(t('files_external', 'Saved'));
+				setTimeout(function(){
+					$submit.val(t('files_external', 'Save'));
+				}, 2500);
+			}
+		});
+		return false;
+	});
+
 	// global instance
 	OCA.External.Settings.mountConfig = mountConfigListView;
 
diff --git a/apps/files_external/l10n/cs_CZ.js b/apps/files_external/l10n/cs_CZ.js
index f816acc561a..388207ca91c 100644
--- a/apps/files_external/l10n/cs_CZ.js
+++ b/apps/files_external/l10n/cs_CZ.js
@@ -21,6 +21,8 @@ OC.L10N.register(
     "Compatibility with Mac NFD encoding (slow)" : "Kompatibilita s Mac NFD kódováním (pomalé)",
     "Admin defined" : "Nastaveno administrátorem",
     "Saved" : "Uloženo",
+    "Saving..." : "Ukládá se...",
+    "Save" : "Uložit",
     "Empty response from the server" : "Prázdná odpověď serveru",
     "Couldn't access. Please logout and login to activate this mount point" : "Nelze připojit. Pro aktivaci tohoto přípojného bodu se prosím odhlašte a znovu přihlašte",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "Nelze obdržet informaci z ownCloud serveru: {code} {type}",
@@ -36,7 +38,6 @@ OC.L10N.register(
     "Credentials saved" : "Přihlašovací údaje uloženy",
     "Credentials saving failed" : "Uložení přihlašovacích údajů selhalo",
     "Credentials required" : "Vyžadovány přihlašovací údaje",
-    "Save" : "Uložit",
     "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",
@@ -64,8 +65,11 @@ OC.L10N.register(
     "Identity endpoint URL" : "Identifikační koncový bod URL",
     "Rackspace" : "Rackspace",
     "API key" : "Klíč API",
+    "Global Credentials" : "Globální přihlašovací údaje",
+    "Log-in credentials, save in database" : "Přihlašovací údaje, ukládat v databázi",
     "Username and password" : "Uživatelské jméno a heslo",
     "Log-in credentials, save in session" : "Přihlašovací údaje, ukládat v sezení",
+    "User entered, store in database" : "Uživatel zadán, uložit v databázi",
     "RSA public key" : "RSA veřejný klíč",
     "Public key" : "Veřejný klíč",
     "Amazon S3" : "Amazon S3",
diff --git a/apps/files_external/l10n/cs_CZ.json b/apps/files_external/l10n/cs_CZ.json
index 893d90c7359..0b349a5b447 100644
--- a/apps/files_external/l10n/cs_CZ.json
+++ b/apps/files_external/l10n/cs_CZ.json
@@ -19,6 +19,8 @@
     "Compatibility with Mac NFD encoding (slow)" : "Kompatibilita s Mac NFD kódováním (pomalé)",
     "Admin defined" : "Nastaveno administrátorem",
     "Saved" : "Uloženo",
+    "Saving..." : "Ukládá se...",
+    "Save" : "Uložit",
     "Empty response from the server" : "Prázdná odpověď serveru",
     "Couldn't access. Please logout and login to activate this mount point" : "Nelze připojit. Pro aktivaci tohoto přípojného bodu se prosím odhlašte a znovu přihlašte",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "Nelze obdržet informaci z ownCloud serveru: {code} {type}",
@@ -34,7 +36,6 @@
     "Credentials saved" : "Přihlašovací údaje uloženy",
     "Credentials saving failed" : "Uložení přihlašovacích údajů selhalo",
     "Credentials required" : "Vyžadovány přihlašovací údaje",
-    "Save" : "Uložit",
     "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",
@@ -62,8 +63,11 @@
     "Identity endpoint URL" : "Identifikační koncový bod URL",
     "Rackspace" : "Rackspace",
     "API key" : "Klíč API",
+    "Global Credentials" : "Globální přihlašovací údaje",
+    "Log-in credentials, save in database" : "Přihlašovací údaje, ukládat v databázi",
     "Username and password" : "Uživatelské jméno a heslo",
     "Log-in credentials, save in session" : "Přihlašovací údaje, ukládat v sezení",
+    "User entered, store in database" : "Uživatel zadán, uložit v databázi",
     "RSA public key" : "RSA veřejný klíč",
     "Public key" : "Veřejný klíč",
     "Amazon S3" : "Amazon S3",
diff --git a/apps/files_external/l10n/da.js b/apps/files_external/l10n/da.js
index 477a67555fa..da2d45c31e7 100644
--- a/apps/files_external/l10n/da.js
+++ b/apps/files_external/l10n/da.js
@@ -18,10 +18,10 @@ OC.L10N.register(
     "(group)" : "(gruppe)",
     "Admin defined" : "Bestemt af administrator",
     "Saved" : "Gemt",
+    "Save" : "Gem",
     "Empty response from the server" : "Svar fra serveren uden data",
     "Username" : "Brugernavn",
     "Password" : "Kodeord",
-    "Save" : "Gem",
     "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",
diff --git a/apps/files_external/l10n/da.json b/apps/files_external/l10n/da.json
index f6020d0ef36..2db7a378ed0 100644
--- a/apps/files_external/l10n/da.json
+++ b/apps/files_external/l10n/da.json
@@ -16,10 +16,10 @@
     "(group)" : "(gruppe)",
     "Admin defined" : "Bestemt af administrator",
     "Saved" : "Gemt",
+    "Save" : "Gem",
     "Empty response from the server" : "Svar fra serveren uden data",
     "Username" : "Brugernavn",
     "Password" : "Kodeord",
-    "Save" : "Gem",
     "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",
diff --git a/apps/files_external/l10n/de.js b/apps/files_external/l10n/de.js
index 28f729c5e19..4e761fa12b0 100644
--- a/apps/files_external/l10n/de.js
+++ b/apps/files_external/l10n/de.js
@@ -21,6 +21,8 @@ OC.L10N.register(
     "Compatibility with Mac NFD encoding (slow)" : "Kompatibilität mit MAC NFD-Kodierung (langsam)",
     "Admin defined" : "Administrator festlegen",
     "Saved" : "Gespeichert",
+    "Saving..." : "Speichern…",
+    "Save" : "Speichern",
     "Empty response from the server" : "leere Antowrt vom Server",
     "Couldn't access. Please logout and login to activate this mount point" : "Anmeldung nicht möglich. Bitte melde dich ab und wieder an, damit du von diesem Endpunkt zugreifen kannst.",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "Es konnten keine Informationen aus dem ownCloud -Server gelesen werden: {code} {type}",
@@ -36,7 +38,6 @@ OC.L10N.register(
     "Credentials saved" : "Anmeldeinformationen gespeichert",
     "Credentials saving failed" : "speichern der Anmeldeinformationen fehlgeschlagen",
     "Credentials required" : "Anmeldeinformationen benötigt",
-    "Save" : "Speichern",
     "Storage with id \"%i\" not found" : "Der Speicher mit der ID „%i“ wurde nicht gefunden",
     "Invalid backend or authentication mechanism class" : "Ungültiger Backend- oder Authentifizierungsmechanismus",
     "Invalid mount point" : "Ungültiger mount point",
@@ -64,8 +65,11 @@ OC.L10N.register(
     "Identity endpoint URL" : "Identität Endpunkt-URL",
     "Rackspace" : "Rackspace",
     "API key" : "API-Schlüssel",
+    "Global Credentials" : "Globale Anmeldeinformationen",
+    "Log-in credentials, save in database" : "Anmeldedaten in Datenbank speichern",
     "Username and password" : "Benutzername und Passwort",
     "Log-in credentials, save in session" : "Anmeldedaten in Sitzung speichern",
+    "User entered, store in database" : "Benutzer eingetragen, in Datenbank gespeichert",
     "RSA public key" : "RSA öffentlicher Schlüssel",
     "Public key" : "Öffentlicher Schlüssel",
     "Amazon S3" : "Amazon S3",
diff --git a/apps/files_external/l10n/de.json b/apps/files_external/l10n/de.json
index 850b2c591af..d263fd3ed77 100644
--- a/apps/files_external/l10n/de.json
+++ b/apps/files_external/l10n/de.json
@@ -19,6 +19,8 @@
     "Compatibility with Mac NFD encoding (slow)" : "Kompatibilität mit MAC NFD-Kodierung (langsam)",
     "Admin defined" : "Administrator festlegen",
     "Saved" : "Gespeichert",
+    "Saving..." : "Speichern…",
+    "Save" : "Speichern",
     "Empty response from the server" : "leere Antowrt vom Server",
     "Couldn't access. Please logout and login to activate this mount point" : "Anmeldung nicht möglich. Bitte melde dich ab und wieder an, damit du von diesem Endpunkt zugreifen kannst.",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "Es konnten keine Informationen aus dem ownCloud -Server gelesen werden: {code} {type}",
@@ -34,7 +36,6 @@
     "Credentials saved" : "Anmeldeinformationen gespeichert",
     "Credentials saving failed" : "speichern der Anmeldeinformationen fehlgeschlagen",
     "Credentials required" : "Anmeldeinformationen benötigt",
-    "Save" : "Speichern",
     "Storage with id \"%i\" not found" : "Der Speicher mit der ID „%i“ wurde nicht gefunden",
     "Invalid backend or authentication mechanism class" : "Ungültiger Backend- oder Authentifizierungsmechanismus",
     "Invalid mount point" : "Ungültiger mount point",
@@ -62,8 +63,11 @@
     "Identity endpoint URL" : "Identität Endpunkt-URL",
     "Rackspace" : "Rackspace",
     "API key" : "API-Schlüssel",
+    "Global Credentials" : "Globale Anmeldeinformationen",
+    "Log-in credentials, save in database" : "Anmeldedaten in Datenbank speichern",
     "Username and password" : "Benutzername und Passwort",
     "Log-in credentials, save in session" : "Anmeldedaten in Sitzung speichern",
+    "User entered, store in database" : "Benutzer eingetragen, in Datenbank gespeichert",
     "RSA public key" : "RSA öffentlicher Schlüssel",
     "Public key" : "Öffentlicher Schlüssel",
     "Amazon S3" : "Amazon S3",
diff --git a/apps/files_external/l10n/de_DE.js b/apps/files_external/l10n/de_DE.js
index 3be71e2212a..9b864b18293 100644
--- a/apps/files_external/l10n/de_DE.js
+++ b/apps/files_external/l10n/de_DE.js
@@ -21,6 +21,8 @@ OC.L10N.register(
     "Compatibility with Mac NFD encoding (slow)" : "Kompatibilität mit MAC NFD-Kodierung (langsam)",
     "Admin defined" : "Administrator definiert",
     "Saved" : "Gespeichert",
+    "Saving..." : "Speichern...",
+    "Save" : "Speichern",
     "Empty response from the server" : "Leere Antwort vom Server erhalten",
     "Couldn't access. Please logout and login to activate this mount point" : "Anmeldung nicht möglich. Bitte melden Sie sich ab und wieder an, damit Sie von diesem Endpunkt zugreifen können.",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "Es konnten keine Informationen aus dem ownCloud -Server gelesen werden: {code} {type}",
@@ -36,7 +38,6 @@ OC.L10N.register(
     "Credentials saved" : "Zugangsdaten gespeichert",
     "Credentials saving failed" : "Speichern der Zugangsdaten fehlgeschlagen",
     "Credentials required" : "Zugangsdaten benötigt",
-    "Save" : "Speichern",
     "Storage with id \"%i\" not found" : "Der Speicher mit der ID „%i“ wurde nicht gefunden",
     "Invalid backend or authentication mechanism class" : "Ungültiges Backend oder falscher Authentifizierungsmodus",
     "Invalid mount point" : "Ungültiger mount point",
@@ -64,8 +65,11 @@ OC.L10N.register(
     "Identity endpoint URL" : "Identität Endpunkt-URL",
     "Rackspace" : "Rackspace",
     "API key" : "API-Schlüssel",
+    "Global Credentials" : "Globale Anmeldeinformationen",
+    "Log-in credentials, save in database" : "Anmeldedaten in Datenbank speichern",
     "Username and password" : "Benutzername und Passwort",
-    "Log-in credentials, save in session" : "Anmelde-Zugangsdaten, speichere in Sitzung",
+    "Log-in credentials, save in session" : "Anmeldedaten in Sitzung speichern",
+    "User entered, store in database" : "Benutzer eingetragen, in Datenbank gespeichert",
     "RSA public key" : "RSA öffentlicher Schlüssel",
     "Public key" : "Öffentlicher Schlüssel",
     "Amazon S3" : "Amazon S3",
diff --git a/apps/files_external/l10n/de_DE.json b/apps/files_external/l10n/de_DE.json
index f30d25135b4..972e91adb4f 100644
--- a/apps/files_external/l10n/de_DE.json
+++ b/apps/files_external/l10n/de_DE.json
@@ -19,6 +19,8 @@
     "Compatibility with Mac NFD encoding (slow)" : "Kompatibilität mit MAC NFD-Kodierung (langsam)",
     "Admin defined" : "Administrator definiert",
     "Saved" : "Gespeichert",
+    "Saving..." : "Speichern...",
+    "Save" : "Speichern",
     "Empty response from the server" : "Leere Antwort vom Server erhalten",
     "Couldn't access. Please logout and login to activate this mount point" : "Anmeldung nicht möglich. Bitte melden Sie sich ab und wieder an, damit Sie von diesem Endpunkt zugreifen können.",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "Es konnten keine Informationen aus dem ownCloud -Server gelesen werden: {code} {type}",
@@ -34,7 +36,6 @@
     "Credentials saved" : "Zugangsdaten gespeichert",
     "Credentials saving failed" : "Speichern der Zugangsdaten fehlgeschlagen",
     "Credentials required" : "Zugangsdaten benötigt",
-    "Save" : "Speichern",
     "Storage with id \"%i\" not found" : "Der Speicher mit der ID „%i“ wurde nicht gefunden",
     "Invalid backend or authentication mechanism class" : "Ungültiges Backend oder falscher Authentifizierungsmodus",
     "Invalid mount point" : "Ungültiger mount point",
@@ -62,8 +63,11 @@
     "Identity endpoint URL" : "Identität Endpunkt-URL",
     "Rackspace" : "Rackspace",
     "API key" : "API-Schlüssel",
+    "Global Credentials" : "Globale Anmeldeinformationen",
+    "Log-in credentials, save in database" : "Anmeldedaten in Datenbank speichern",
     "Username and password" : "Benutzername und Passwort",
-    "Log-in credentials, save in session" : "Anmelde-Zugangsdaten, speichere in Sitzung",
+    "Log-in credentials, save in session" : "Anmeldedaten in Sitzung speichern",
+    "User entered, store in database" : "Benutzer eingetragen, in Datenbank gespeichert",
     "RSA public key" : "RSA öffentlicher Schlüssel",
     "Public key" : "Öffentlicher Schlüssel",
     "Amazon S3" : "Amazon S3",
diff --git a/apps/files_external/l10n/el.js b/apps/files_external/l10n/el.js
index 762bd19bef7..412cd459a9a 100644
--- a/apps/files_external/l10n/el.js
+++ b/apps/files_external/l10n/el.js
@@ -17,13 +17,13 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Όλοι οι χρήστες. Πληκτρολογήστε για να επιλέξετε χρήστη ή ομάδα.",
     "(group)" : "(ομάδα)",
     "Saved" : "Αποθηκεύτηκαν",
+    "Save" : "Αποθήκευση",
     "There was an error with message: " : "Υπήρξε σφάλμα στο μήνυμα:",
     "External mount error" : "Σφάλμα εξωτερικής προσάρτησης",
     "Username" : "Όνομα χρήστη",
     "Password" : "Κωδικός πρόσβασης",
     "Credentials saved" : "Τα διαπιστευτήρια αποθηκεύτηκαν",
     "Credentials saving failed" : "Αποτυχία αποθήκευσης διαπιστευτηρίων",
-    "Save" : "Αποθήκευση",
     "Storage with id \"%i\" not found" : "Αποθήκευση με id \"%i\" δεν βρέθηκε",
     "Invalid backend or authentication mechanism class" : "Μη έγκυρη κλάση συστήματος ή μηχανισμού πιστοποίησης",
     "Invalid mount point" : "Μη έγκυρο σημείο ανάρτησης",
diff --git a/apps/files_external/l10n/el.json b/apps/files_external/l10n/el.json
index d350f956f4a..2a4785e3211 100644
--- a/apps/files_external/l10n/el.json
+++ b/apps/files_external/l10n/el.json
@@ -15,13 +15,13 @@
     "All users. Type to select user or group." : "Όλοι οι χρήστες. Πληκτρολογήστε για να επιλέξετε χρήστη ή ομάδα.",
     "(group)" : "(ομάδα)",
     "Saved" : "Αποθηκεύτηκαν",
+    "Save" : "Αποθήκευση",
     "There was an error with message: " : "Υπήρξε σφάλμα στο μήνυμα:",
     "External mount error" : "Σφάλμα εξωτερικής προσάρτησης",
     "Username" : "Όνομα χρήστη",
     "Password" : "Κωδικός πρόσβασης",
     "Credentials saved" : "Τα διαπιστευτήρια αποθηκεύτηκαν",
     "Credentials saving failed" : "Αποτυχία αποθήκευσης διαπιστευτηρίων",
-    "Save" : "Αποθήκευση",
     "Storage with id \"%i\" not found" : "Αποθήκευση με id \"%i\" δεν βρέθηκε",
     "Invalid backend or authentication mechanism class" : "Μη έγκυρη κλάση συστήματος ή μηχανισμού πιστοποίησης",
     "Invalid mount point" : "Μη έγκυρο σημείο ανάρτησης",
diff --git a/apps/files_external/l10n/en_GB.js b/apps/files_external/l10n/en_GB.js
index ebfad01c69d..9afbe156ccc 100644
--- a/apps/files_external/l10n/en_GB.js
+++ b/apps/files_external/l10n/en_GB.js
@@ -21,6 +21,8 @@ OC.L10N.register(
     "Compatibility with Mac NFD encoding (slow)" : "Compatibility with Mac NFD encoding (slow)",
     "Admin defined" : "Admin defined",
     "Saved" : "Saved",
+    "Saving..." : "Saving...",
+    "Save" : "Save",
     "Empty response from the server" : "Empty response from the server",
     "Couldn't access. Please logout and login to activate this mount point" : "Couldn't access. Please logout and login to activate this mount point",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "Couldn't get the information from the ownCloud server: {code} {type}",
@@ -36,7 +38,6 @@ OC.L10N.register(
     "Credentials saved" : "Credentials saved",
     "Credentials saving failed" : "Credentials saving failed",
     "Credentials required" : "Credentials required",
-    "Save" : "Save",
     "Storage with id \"%i\" not found" : "Storage with id \"%i\" not found",
     "Invalid backend or authentication mechanism class" : "Invalid backend or authentication mechanism class",
     "Invalid mount point" : "Invalid mount point",
@@ -64,8 +65,11 @@ OC.L10N.register(
     "Identity endpoint URL" : "Identity endpoint URL",
     "Rackspace" : "Rackspace",
     "API key" : "API key",
+    "Global Credentials" : "Global Credentials",
+    "Log-in credentials, save in database" : "Log-in credentials, save in database",
     "Username and password" : "Username and password",
     "Log-in credentials, save in session" : "Log-in credentials, save in session",
+    "User entered, store in database" : "User entered, store in database",
     "RSA public key" : "RSA public key",
     "Public key" : "Public key",
     "Amazon S3" : "Amazon S3",
diff --git a/apps/files_external/l10n/en_GB.json b/apps/files_external/l10n/en_GB.json
index 854b114f750..83d638a7395 100644
--- a/apps/files_external/l10n/en_GB.json
+++ b/apps/files_external/l10n/en_GB.json
@@ -19,6 +19,8 @@
     "Compatibility with Mac NFD encoding (slow)" : "Compatibility with Mac NFD encoding (slow)",
     "Admin defined" : "Admin defined",
     "Saved" : "Saved",
+    "Saving..." : "Saving...",
+    "Save" : "Save",
     "Empty response from the server" : "Empty response from the server",
     "Couldn't access. Please logout and login to activate this mount point" : "Couldn't access. Please logout and login to activate this mount point",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "Couldn't get the information from the ownCloud server: {code} {type}",
@@ -34,7 +36,6 @@
     "Credentials saved" : "Credentials saved",
     "Credentials saving failed" : "Credentials saving failed",
     "Credentials required" : "Credentials required",
-    "Save" : "Save",
     "Storage with id \"%i\" not found" : "Storage with id \"%i\" not found",
     "Invalid backend or authentication mechanism class" : "Invalid backend or authentication mechanism class",
     "Invalid mount point" : "Invalid mount point",
@@ -62,8 +63,11 @@
     "Identity endpoint URL" : "Identity endpoint URL",
     "Rackspace" : "Rackspace",
     "API key" : "API key",
+    "Global Credentials" : "Global Credentials",
+    "Log-in credentials, save in database" : "Log-in credentials, save in database",
     "Username and password" : "Username and password",
     "Log-in credentials, save in session" : "Log-in credentials, save in session",
+    "User entered, store in database" : "User entered, store in database",
     "RSA public key" : "RSA public key",
     "Public key" : "Public key",
     "Amazon S3" : "Amazon S3",
diff --git a/apps/files_external/l10n/es.js b/apps/files_external/l10n/es.js
index fe0607108a6..3dff3557af8 100644
--- a/apps/files_external/l10n/es.js
+++ b/apps/files_external/l10n/es.js
@@ -21,6 +21,8 @@ OC.L10N.register(
     "Compatibility with Mac NFD encoding (slow)" : "Compatibilidad con codificación Mac MFD (lento)",
     "Admin defined" : "Admin definido",
     "Saved" : "Guardado",
+    "Saving..." : "Guardando...",
+    "Save" : "Guardar",
     "Empty response from the server" : "Respuesta vacía desde el servidor",
     "Couldn't access. Please logout and login to activate this mount point" : "No se puede acceder. Por favor cierra sesión e iníciala de nuevo para activar este punto de montaje",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "No se puede obtener información acerca del servidor de OwnCloud: {code} {type}",
@@ -36,7 +38,6 @@ OC.L10N.register(
     "Credentials saved" : "Credenciales guardados",
     "Credentials saving failed" : "Guardado de credenciales fallido",
     "Credentials required" : "Credenciales requeridos",
-    "Save" : "Guardar",
     "Storage with id \"%i\" not found" : "No se ha encontrado almacenamiento con id \"%i\"",
     "Invalid backend or authentication mechanism class" : "Sistema o mecanismo de autentificación inválido",
     "Invalid mount point" : "Punto de montaje no válido",
@@ -64,8 +65,11 @@ OC.L10N.register(
     "Identity endpoint URL" : "Identidad de punto final URL",
     "Rackspace" : "Espacio de Rack",
     "API key" : "Clave API",
+    "Global Credentials" : "Credenciales Globales",
+    "Log-in credentials, save in database" : "Credenciales de inicio de sesión, salvar en la base de datos",
     "Username and password" : "Nombre de usuario y contraseña",
     "Log-in credentials, save in session" : "Credenciales de login, guardar en la sesión",
+    "User entered, store in database" : "Usuario registrado, almacenar en la base de datos",
     "RSA public key" : "Clave pública RSA",
     "Public key" : "Clave pública",
     "Amazon S3" : "Amazon S3",
diff --git a/apps/files_external/l10n/es.json b/apps/files_external/l10n/es.json
index 3dea5dd6abd..55ee9ad1ea8 100644
--- a/apps/files_external/l10n/es.json
+++ b/apps/files_external/l10n/es.json
@@ -19,6 +19,8 @@
     "Compatibility with Mac NFD encoding (slow)" : "Compatibilidad con codificación Mac MFD (lento)",
     "Admin defined" : "Admin definido",
     "Saved" : "Guardado",
+    "Saving..." : "Guardando...",
+    "Save" : "Guardar",
     "Empty response from the server" : "Respuesta vacía desde el servidor",
     "Couldn't access. Please logout and login to activate this mount point" : "No se puede acceder. Por favor cierra sesión e iníciala de nuevo para activar este punto de montaje",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "No se puede obtener información acerca del servidor de OwnCloud: {code} {type}",
@@ -34,7 +36,6 @@
     "Credentials saved" : "Credenciales guardados",
     "Credentials saving failed" : "Guardado de credenciales fallido",
     "Credentials required" : "Credenciales requeridos",
-    "Save" : "Guardar",
     "Storage with id \"%i\" not found" : "No se ha encontrado almacenamiento con id \"%i\"",
     "Invalid backend or authentication mechanism class" : "Sistema o mecanismo de autentificación inválido",
     "Invalid mount point" : "Punto de montaje no válido",
@@ -62,8 +63,11 @@
     "Identity endpoint URL" : "Identidad de punto final URL",
     "Rackspace" : "Espacio de Rack",
     "API key" : "Clave API",
+    "Global Credentials" : "Credenciales Globales",
+    "Log-in credentials, save in database" : "Credenciales de inicio de sesión, salvar en la base de datos",
     "Username and password" : "Nombre de usuario y contraseña",
     "Log-in credentials, save in session" : "Credenciales de login, guardar en la sesión",
+    "User entered, store in database" : "Usuario registrado, almacenar en la base de datos",
     "RSA public key" : "Clave pública RSA",
     "Public key" : "Clave pública",
     "Amazon S3" : "Amazon S3",
diff --git a/apps/files_external/l10n/et_EE.js b/apps/files_external/l10n/et_EE.js
index 795f89accd6..56fd4b06177 100644
--- a/apps/files_external/l10n/et_EE.js
+++ b/apps/files_external/l10n/et_EE.js
@@ -15,6 +15,7 @@ OC.L10N.register(
     "(group)" : "(grupp)",
     "Admin defined" : "Admini poolt määratud",
     "Saved" : "Salvestatud",
+    "Save" : "Salvesta",
     "Empty response from the server" : "Tühi vastus serverilt",
     "Couldn't get the list of external mount points: {type}" : "Välise ühenduspunkti hankimine ebaõnnestus: {type}",
     "There was an error with message: " : "Sõnumiga tekkis tõrge:",
@@ -23,7 +24,6 @@ OC.L10N.register(
     "Username" : "Kasutajanimi",
     "Password" : "Parool",
     "Credentials required" : "Kasutajatunnused on nõutud",
-    "Save" : "Salvesta",
     "Storage with id \"%i\" not found" : "Salvestuskohta ID-ga \"%i\" ei leitud",
     "Invalid mount point" : "Vigane ühenduspunkt",
     "Objectstore forbidden" : "Objectstore on keelatud",
diff --git a/apps/files_external/l10n/et_EE.json b/apps/files_external/l10n/et_EE.json
index 39f060107d1..4ff193c2d3d 100644
--- a/apps/files_external/l10n/et_EE.json
+++ b/apps/files_external/l10n/et_EE.json
@@ -13,6 +13,7 @@
     "(group)" : "(grupp)",
     "Admin defined" : "Admini poolt määratud",
     "Saved" : "Salvestatud",
+    "Save" : "Salvesta",
     "Empty response from the server" : "Tühi vastus serverilt",
     "Couldn't get the list of external mount points: {type}" : "Välise ühenduspunkti hankimine ebaõnnestus: {type}",
     "There was an error with message: " : "Sõnumiga tekkis tõrge:",
@@ -21,7 +22,6 @@
     "Username" : "Kasutajanimi",
     "Password" : "Parool",
     "Credentials required" : "Kasutajatunnused on nõutud",
-    "Save" : "Salvesta",
     "Storage with id \"%i\" not found" : "Salvestuskohta ID-ga \"%i\" ei leitud",
     "Invalid mount point" : "Vigane ühenduspunkt",
     "Objectstore forbidden" : "Objectstore on keelatud",
diff --git a/apps/files_external/l10n/fi_FI.js b/apps/files_external/l10n/fi_FI.js
index 8ccaa2f0a42..19e37c94cfd 100644
--- a/apps/files_external/l10n/fi_FI.js
+++ b/apps/files_external/l10n/fi_FI.js
@@ -17,6 +17,7 @@ OC.L10N.register(
     "(group)" : "(ryhmä)",
     "Admin defined" : "Ylläpitäjän määrittämä",
     "Saved" : "Tallennettu",
+    "Save" : "Tallenna",
     "Empty response from the server" : "Tyhjä vastaus palvelimelta",
     "Couldn't access. Please logout and login to activate this mount point" : "Käyttö epäonnistui. Kirjaudu ulos ja takaisin sisään aktivoidaksesi tämän liitospisteen",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "Tietojen saaminen ownCloud-palvelimelta epäonnistui: {code} {type}",
@@ -31,7 +32,6 @@ OC.L10N.register(
     "Credentials saved" : "Kirjautumistiedot tallennettu",
     "Credentials saving failed" : "Kirjautumistietojen tallentaminen epäonnistui",
     "Credentials required" : "Kirjautumistiedot vaaditaan",
-    "Save" : "Tallenna",
     "Storage with id \"%i\" not found" : "Tallennustilaa tunnisteella \"%i\" ei löytynyt",
     "Invalid mount point" : "Virheellinen liitoskohta",
     "%s" : "%s",
diff --git a/apps/files_external/l10n/fi_FI.json b/apps/files_external/l10n/fi_FI.json
index 21c195cd737..cc39a8213e4 100644
--- a/apps/files_external/l10n/fi_FI.json
+++ b/apps/files_external/l10n/fi_FI.json
@@ -15,6 +15,7 @@
     "(group)" : "(ryhmä)",
     "Admin defined" : "Ylläpitäjän määrittämä",
     "Saved" : "Tallennettu",
+    "Save" : "Tallenna",
     "Empty response from the server" : "Tyhjä vastaus palvelimelta",
     "Couldn't access. Please logout and login to activate this mount point" : "Käyttö epäonnistui. Kirjaudu ulos ja takaisin sisään aktivoidaksesi tämän liitospisteen",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "Tietojen saaminen ownCloud-palvelimelta epäonnistui: {code} {type}",
@@ -29,7 +30,6 @@
     "Credentials saved" : "Kirjautumistiedot tallennettu",
     "Credentials saving failed" : "Kirjautumistietojen tallentaminen epäonnistui",
     "Credentials required" : "Kirjautumistiedot vaaditaan",
-    "Save" : "Tallenna",
     "Storage with id \"%i\" not found" : "Tallennustilaa tunnisteella \"%i\" ei löytynyt",
     "Invalid mount point" : "Virheellinen liitoskohta",
     "%s" : "%s",
diff --git a/apps/files_external/l10n/fr.js b/apps/files_external/l10n/fr.js
index f75cec87c11..486431de5e0 100644
--- a/apps/files_external/l10n/fr.js
+++ b/apps/files_external/l10n/fr.js
@@ -21,6 +21,8 @@ OC.L10N.register(
     "Compatibility with Mac NFD encoding (slow)" : "Compatibilité avec l'encodage Mac NFD (lent)",
     "Admin defined" : "Défini par l'administrateur",
     "Saved" : "Sauvegardé",
+    "Saving..." : "Enregistrement...",
+    "Save" : "Enregistrer",
     "Empty response from the server" : "Réponse vide du serveur",
     "Couldn't access. Please logout and login to activate this mount point" : "Impossible d'accéder. Veuillez vous déconnecter et vous reconnecter pour activer ce point de montage.",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "Impossible d'obtenir l'information depuis le serveur ownCloud : {code} {type}",
@@ -36,7 +38,6 @@ OC.L10N.register(
     "Credentials saved" : "Identifiants sauvegardés",
     "Credentials saving failed" : "La sauvegarde des identifiants a échoué",
     "Credentials required" : "Des informations d'identification sont requises",
-    "Save" : "Enregistrer",
     "Storage with id \"%i\" not found" : "Stockage avec l'id \"%i\" non trouvé",
     "Invalid backend or authentication mechanism class" : "Service ou méthode d'authentification non valable",
     "Invalid mount point" : "Point de montage non valide",
@@ -64,8 +65,11 @@ OC.L10N.register(
     "Identity endpoint URL" : "Identity endpoint URL",
     "Rackspace" : "Rackspace",
     "API key" : "Clé API",
+    "Global Credentials" : "Informations d'identification globales",
+    "Log-in credentials, save in database" : "Identifiants de connexion, sauvegarder dans la base de données",
     "Username and password" : "Nom d'utilisateur et mot de passe",
     "Log-in credentials, save in session" : "Identifiants de connexion, sauvegardés pour la session",
+    "User entered, store in database" : "Utilisateur entré, stocker dans la base de données",
     "RSA public key" : "Clé publique RSA",
     "Public key" : "Clef publique",
     "Amazon S3" : "Amazon S3",
diff --git a/apps/files_external/l10n/fr.json b/apps/files_external/l10n/fr.json
index 856f6b06d9a..0ab8b413928 100644
--- a/apps/files_external/l10n/fr.json
+++ b/apps/files_external/l10n/fr.json
@@ -19,6 +19,8 @@
     "Compatibility with Mac NFD encoding (slow)" : "Compatibilité avec l'encodage Mac NFD (lent)",
     "Admin defined" : "Défini par l'administrateur",
     "Saved" : "Sauvegardé",
+    "Saving..." : "Enregistrement...",
+    "Save" : "Enregistrer",
     "Empty response from the server" : "Réponse vide du serveur",
     "Couldn't access. Please logout and login to activate this mount point" : "Impossible d'accéder. Veuillez vous déconnecter et vous reconnecter pour activer ce point de montage.",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "Impossible d'obtenir l'information depuis le serveur ownCloud : {code} {type}",
@@ -34,7 +36,6 @@
     "Credentials saved" : "Identifiants sauvegardés",
     "Credentials saving failed" : "La sauvegarde des identifiants a échoué",
     "Credentials required" : "Des informations d'identification sont requises",
-    "Save" : "Enregistrer",
     "Storage with id \"%i\" not found" : "Stockage avec l'id \"%i\" non trouvé",
     "Invalid backend or authentication mechanism class" : "Service ou méthode d'authentification non valable",
     "Invalid mount point" : "Point de montage non valide",
@@ -62,8 +63,11 @@
     "Identity endpoint URL" : "Identity endpoint URL",
     "Rackspace" : "Rackspace",
     "API key" : "Clé API",
+    "Global Credentials" : "Informations d'identification globales",
+    "Log-in credentials, save in database" : "Identifiants de connexion, sauvegarder dans la base de données",
     "Username and password" : "Nom d'utilisateur et mot de passe",
     "Log-in credentials, save in session" : "Identifiants de connexion, sauvegardés pour la session",
+    "User entered, store in database" : "Utilisateur entré, stocker dans la base de données",
     "RSA public key" : "Clé publique RSA",
     "Public key" : "Clef publique",
     "Amazon S3" : "Amazon S3",
diff --git a/apps/files_external/l10n/he.js b/apps/files_external/l10n/he.js
index 67f55aa2731..06c21bf6da4 100644
--- a/apps/files_external/l10n/he.js
+++ b/apps/files_external/l10n/he.js
@@ -21,6 +21,7 @@ OC.L10N.register(
     "Compatibility with Mac NFD encoding (slow)" : "תואם של קידוד Mac NFD (איטי)",
     "Admin defined" : "הוגדר מנהל",
     "Saved" : "נשמר",
+    "Save" : "שמירה",
     "Empty response from the server" : "תגובה ריקה מהשרת",
     "Couldn't access. Please logout and login to activate this mount point" : "לא ניתן להכנס. יש להתנתק ולהתחבר כדי להפעיל את נקודת העיגון הזו",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "לא ניתן היה לקבל את המידע משרת ה- ownCloud: {code} {type}",
@@ -36,7 +37,6 @@ OC.L10N.register(
     "Credentials saved" : "פרטי גישה נשמרו",
     "Credentials saving failed" : "שמירת פרטי גישה נכשלה",
     "Credentials required" : "נדרשים פרטי גישה",
-    "Save" : "שמירה",
     "Storage with id \"%i\" not found" : "אחסון עם מספר זיהוי \"%i\" לא אותר",
     "Invalid backend or authentication mechanism class" : "צד אחורי או סוג מנגנון אימות לא חוקי",
     "Invalid mount point" : "נקודת עגינה לא חוקית",
diff --git a/apps/files_external/l10n/he.json b/apps/files_external/l10n/he.json
index 26d8ed084a2..5d32f179106 100644
--- a/apps/files_external/l10n/he.json
+++ b/apps/files_external/l10n/he.json
@@ -19,6 +19,7 @@
     "Compatibility with Mac NFD encoding (slow)" : "תואם של קידוד Mac NFD (איטי)",
     "Admin defined" : "הוגדר מנהל",
     "Saved" : "נשמר",
+    "Save" : "שמירה",
     "Empty response from the server" : "תגובה ריקה מהשרת",
     "Couldn't access. Please logout and login to activate this mount point" : "לא ניתן להכנס. יש להתנתק ולהתחבר כדי להפעיל את נקודת העיגון הזו",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "לא ניתן היה לקבל את המידע משרת ה- ownCloud: {code} {type}",
@@ -34,7 +35,6 @@
     "Credentials saved" : "פרטי גישה נשמרו",
     "Credentials saving failed" : "שמירת פרטי גישה נכשלה",
     "Credentials required" : "נדרשים פרטי גישה",
-    "Save" : "שמירה",
     "Storage with id \"%i\" not found" : "אחסון עם מספר זיהוי \"%i\" לא אותר",
     "Invalid backend or authentication mechanism class" : "צד אחורי או סוג מנגנון אימות לא חוקי",
     "Invalid mount point" : "נקודת עגינה לא חוקית",
diff --git a/apps/files_external/l10n/id.js b/apps/files_external/l10n/id.js
index 8911d9eb4a3..cf81575a51a 100644
--- a/apps/files_external/l10n/id.js
+++ b/apps/files_external/l10n/id.js
@@ -17,9 +17,9 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Semua pengguna. Ketik untuk memilih pengguna atau grup.",
     "(group)" : "(grup)",
     "Saved" : "Disimpan",
+    "Save" : "Simpan",
     "Username" : "Nama Pengguna",
     "Password" : "Sandi",
-    "Save" : "Simpan",
     "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",
diff --git a/apps/files_external/l10n/id.json b/apps/files_external/l10n/id.json
index f2b130b0101..d4c96b1ce4b 100644
--- a/apps/files_external/l10n/id.json
+++ b/apps/files_external/l10n/id.json
@@ -15,9 +15,9 @@
     "All users. Type to select user or group." : "Semua pengguna. Ketik untuk memilih pengguna atau grup.",
     "(group)" : "(grup)",
     "Saved" : "Disimpan",
+    "Save" : "Simpan",
     "Username" : "Nama Pengguna",
     "Password" : "Sandi",
-    "Save" : "Simpan",
     "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",
diff --git a/apps/files_external/l10n/is.js b/apps/files_external/l10n/is.js
index 75d8dcd089e..80d39a2ba9a 100644
--- a/apps/files_external/l10n/is.js
+++ b/apps/files_external/l10n/is.js
@@ -18,6 +18,7 @@ OC.L10N.register(
     "(group)" : "(hópur)",
     "Admin defined" : "Skilgreindur kerfisstjóri",
     "Saved" : "Vistað",
+    "Save" : "Vista",
     "Empty response from the server" : "Tómt svar frá þjóni móttekið",
     "Couldn't access. Please logout and login to activate this mount point" : "Náði ekki aðgangi. Skráðu þig út og svo aftur inn til að virkja þennan tengipunkt",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "Gat ekki lesið upplýsingar frá ownCloud-þjóninum: {code} {type}",
@@ -33,7 +34,6 @@ OC.L10N.register(
     "Credentials saved" : "Auðkenni vistuð",
     "Credentials saving failed" : "Vistun auðkenna tókst ekki",
     "Credentials required" : "Auðkenna krafist",
-    "Save" : "Vista",
     "Storage with id \"%i\" not found" : "Geymsla með auðkennið '%i' fannst ekki",
     "Invalid backend or authentication mechanism class" : "Ógildur flokkur bakenda eða auðkenningartækni",
     "Invalid mount point" : "Ógildur tengipunktur",
diff --git a/apps/files_external/l10n/is.json b/apps/files_external/l10n/is.json
index 21faff9c899..f5b3a1b1d33 100644
--- a/apps/files_external/l10n/is.json
+++ b/apps/files_external/l10n/is.json
@@ -16,6 +16,7 @@
     "(group)" : "(hópur)",
     "Admin defined" : "Skilgreindur kerfisstjóri",
     "Saved" : "Vistað",
+    "Save" : "Vista",
     "Empty response from the server" : "Tómt svar frá þjóni móttekið",
     "Couldn't access. Please logout and login to activate this mount point" : "Náði ekki aðgangi. Skráðu þig út og svo aftur inn til að virkja þennan tengipunkt",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "Gat ekki lesið upplýsingar frá ownCloud-þjóninum: {code} {type}",
@@ -31,7 +32,6 @@
     "Credentials saved" : "Auðkenni vistuð",
     "Credentials saving failed" : "Vistun auðkenna tókst ekki",
     "Credentials required" : "Auðkenna krafist",
-    "Save" : "Vista",
     "Storage with id \"%i\" not found" : "Geymsla með auðkennið '%i' fannst ekki",
     "Invalid backend or authentication mechanism class" : "Ógildur flokkur bakenda eða auðkenningartækni",
     "Invalid mount point" : "Ógildur tengipunktur",
diff --git a/apps/files_external/l10n/it.js b/apps/files_external/l10n/it.js
index 8bc2f0c559d..134e8a6cedf 100644
--- a/apps/files_external/l10n/it.js
+++ b/apps/files_external/l10n/it.js
@@ -21,6 +21,8 @@ OC.L10N.register(
     "Compatibility with Mac NFD encoding (slow)" : "Compatibilità con la codifica Mac NFD (lento)",
     "Admin defined" : "Definito dall'amministratore",
     "Saved" : "Salvato",
+    "Saving..." : "Salvataggio in corso...",
+    "Save" : "Salva",
     "Empty response from the server" : "Risposta vuota dal server",
     "Couldn't access. Please logout and login to activate this mount point" : "Impossibile accedere. Chiudi la sessione e accedi nuovamente per attivare questo punto di mount",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "Impossibile ottenere le informazioni dal server ownCloud: {code} {type}",
@@ -36,7 +38,6 @@ OC.L10N.register(
     "Credentials saved" : "Credenziali salvate",
     "Credentials saving failed" : "Salvataggio delle credenziali non riuscito",
     "Credentials required" : "Credenziali richieste",
-    "Save" : "Salva",
     "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",
@@ -64,8 +65,11 @@ OC.L10N.register(
     "Identity endpoint URL" : "URL endpoint delle identità",
     "Rackspace" : "Rackspace",
     "API key" : "Chiave API",
+    "Global Credentials" : "Credenziali globali",
+    "Log-in credentials, save in database" : "Credenziali di accesso, salva nel database",
     "Username and password" : "Nome utente e password",
     "Log-in credentials, save in session" : "Credenziali di accesso, salva nella sessione",
+    "User entered, store in database" : "Inserite dall'utente, salva nel database",
     "RSA public key" : "Chiave pubblica RSA",
     "Public key" : "Chiave pubblica",
     "Amazon S3" : "Amazon S3",
diff --git a/apps/files_external/l10n/it.json b/apps/files_external/l10n/it.json
index 12b88461e72..cb59b88e566 100644
--- a/apps/files_external/l10n/it.json
+++ b/apps/files_external/l10n/it.json
@@ -19,6 +19,8 @@
     "Compatibility with Mac NFD encoding (slow)" : "Compatibilità con la codifica Mac NFD (lento)",
     "Admin defined" : "Definito dall'amministratore",
     "Saved" : "Salvato",
+    "Saving..." : "Salvataggio in corso...",
+    "Save" : "Salva",
     "Empty response from the server" : "Risposta vuota dal server",
     "Couldn't access. Please logout and login to activate this mount point" : "Impossibile accedere. Chiudi la sessione e accedi nuovamente per attivare questo punto di mount",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "Impossibile ottenere le informazioni dal server ownCloud: {code} {type}",
@@ -34,7 +36,6 @@
     "Credentials saved" : "Credenziali salvate",
     "Credentials saving failed" : "Salvataggio delle credenziali non riuscito",
     "Credentials required" : "Credenziali richieste",
-    "Save" : "Salva",
     "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",
@@ -62,8 +63,11 @@
     "Identity endpoint URL" : "URL endpoint delle identità",
     "Rackspace" : "Rackspace",
     "API key" : "Chiave API",
+    "Global Credentials" : "Credenziali globali",
+    "Log-in credentials, save in database" : "Credenziali di accesso, salva nel database",
     "Username and password" : "Nome utente e password",
     "Log-in credentials, save in session" : "Credenziali di accesso, salva nella sessione",
+    "User entered, store in database" : "Inserite dall'utente, salva nel database",
     "RSA public key" : "Chiave pubblica RSA",
     "Public key" : "Chiave pubblica",
     "Amazon S3" : "Amazon S3",
diff --git a/apps/files_external/l10n/ja.js b/apps/files_external/l10n/ja.js
index bbd7c34bdd1..318db1ee79f 100644
--- a/apps/files_external/l10n/ja.js
+++ b/apps/files_external/l10n/ja.js
@@ -18,8 +18,11 @@ OC.L10N.register(
     "Error generating key pair" : "キーペアの生成エラー",
     "All users. Type to select user or group." : "すべてのユーザー。ユーザー、グループを追加",
     "(group)" : "(グループ)",
+    "Compatibility with Mac NFD encoding (slow)" : "Mac NFD エンコード互換 (遅い)",
     "Admin defined" : "管理者設定済",
     "Saved" : "保存されました",
+    "Saving..." : "保存中...",
+    "Save" : "保存",
     "Empty response from the server" : "サーバーから空の応答がありました",
     "Couldn't access. Please logout and login to activate this mount point" : "アクセス出来ませんでした｡このマウントポイントを有効にするには一度ログアウトしてからログインしてください。",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "ownCloud サーバーから情報を取得出来ませんでした。: {code} {type}",
@@ -35,7 +38,6 @@ OC.L10N.register(
     "Credentials saved" : "資格情報を保存しました",
     "Credentials saving failed" : "資格情報の保存に失敗しました",
     "Credentials required" : "資格情報が必要です",
-    "Save" : "保存",
     "Storage with id \"%i\" not found" : "ストレージID \"%i\" が見つかりません",
     "Invalid backend or authentication mechanism class" : "バックエンドまたは認証システムクラスが無効",
     "Invalid mount point" : "無効なマウントポイント",
@@ -63,8 +65,11 @@ OC.L10N.register(
     "Identity endpoint URL" : "認証エンドポイントURL",
     "Rackspace" : "Rackspace",
     "API key" : "APIキー",
+    "Global Credentials" : "グローバル認証情報",
+    "Log-in credentials, save in database" : "ログイン認証情報は、データベースに保存されます。",
     "Username and password" : "ユーザー名とパスワード",
     "Log-in credentials, save in session" : "ログイン認証情報は、セッションに保存されます。",
+    "User entered, store in database" : "入力されたユーザーデータは、データベースに保管します",
     "RSA public key" : "RSA公開鍵",
     "Public key" : "公開鍵",
     "Amazon S3" : "Amazon S3",
diff --git a/apps/files_external/l10n/ja.json b/apps/files_external/l10n/ja.json
index 45712c90c9d..0c4be487cfb 100644
--- a/apps/files_external/l10n/ja.json
+++ b/apps/files_external/l10n/ja.json
@@ -16,8 +16,11 @@
     "Error generating key pair" : "キーペアの生成エラー",
     "All users. Type to select user or group." : "すべてのユーザー。ユーザー、グループを追加",
     "(group)" : "(グループ)",
+    "Compatibility with Mac NFD encoding (slow)" : "Mac NFD エンコード互換 (遅い)",
     "Admin defined" : "管理者設定済",
     "Saved" : "保存されました",
+    "Saving..." : "保存中...",
+    "Save" : "保存",
     "Empty response from the server" : "サーバーから空の応答がありました",
     "Couldn't access. Please logout and login to activate this mount point" : "アクセス出来ませんでした｡このマウントポイントを有効にするには一度ログアウトしてからログインしてください。",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "ownCloud サーバーから情報を取得出来ませんでした。: {code} {type}",
@@ -33,7 +36,6 @@
     "Credentials saved" : "資格情報を保存しました",
     "Credentials saving failed" : "資格情報の保存に失敗しました",
     "Credentials required" : "資格情報が必要です",
-    "Save" : "保存",
     "Storage with id \"%i\" not found" : "ストレージID \"%i\" が見つかりません",
     "Invalid backend or authentication mechanism class" : "バックエンドまたは認証システムクラスが無効",
     "Invalid mount point" : "無効なマウントポイント",
@@ -61,8 +63,11 @@
     "Identity endpoint URL" : "認証エンドポイントURL",
     "Rackspace" : "Rackspace",
     "API key" : "APIキー",
+    "Global Credentials" : "グローバル認証情報",
+    "Log-in credentials, save in database" : "ログイン認証情報は、データベースに保存されます。",
     "Username and password" : "ユーザー名とパスワード",
     "Log-in credentials, save in session" : "ログイン認証情報は、セッションに保存されます。",
+    "User entered, store in database" : "入力されたユーザーデータは、データベースに保管します",
     "RSA public key" : "RSA公開鍵",
     "Public key" : "公開鍵",
     "Amazon S3" : "Amazon S3",
diff --git a/apps/files_external/l10n/ko.js b/apps/files_external/l10n/ko.js
index 8601a85bcf5..95befb8b229 100644
--- a/apps/files_external/l10n/ko.js
+++ b/apps/files_external/l10n/ko.js
@@ -18,6 +18,7 @@ OC.L10N.register(
     "(group)" : "(그룹)",
     "Admin defined" : "관리자 지정",
     "Saved" : "저장됨",
+    "Save" : "저장",
     "Empty response from the server" : "서버에서 빈 응답이 돌아옴",
     "Couldn't access. Please logout and login to activate this mount point" : "접근할 수 없습니다. 이 마운트 지점을 활성화하려면 로그아웃 후 로그인하십시오",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "ownCloud 서버에서 정보를 가져올 수 없음: {code} {type}",
@@ -33,7 +34,6 @@ OC.L10N.register(
     "Credentials saved" : "인증 정보 저장됨",
     "Credentials saving failed" : "인증 정보를 저장할 수 없음",
     "Credentials required" : "인증 정보 필요함",
-    "Save" : "저장",
     "Storage with id \"%i\" not found" : "ID가 \"%i\"인 저장소를 찾을 수 없음",
     "Invalid backend or authentication mechanism class" : "백엔드나 인증 방식 클래스가 잘못됨",
     "Invalid mount point" : "잘못된 마운트 지점",
diff --git a/apps/files_external/l10n/ko.json b/apps/files_external/l10n/ko.json
index 7eafd84ae03..14596ea544a 100644
--- a/apps/files_external/l10n/ko.json
+++ b/apps/files_external/l10n/ko.json
@@ -16,6 +16,7 @@
     "(group)" : "(그룹)",
     "Admin defined" : "관리자 지정",
     "Saved" : "저장됨",
+    "Save" : "저장",
     "Empty response from the server" : "서버에서 빈 응답이 돌아옴",
     "Couldn't access. Please logout and login to activate this mount point" : "접근할 수 없습니다. 이 마운트 지점을 활성화하려면 로그아웃 후 로그인하십시오",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "ownCloud 서버에서 정보를 가져올 수 없음: {code} {type}",
@@ -31,7 +32,6 @@
     "Credentials saved" : "인증 정보 저장됨",
     "Credentials saving failed" : "인증 정보를 저장할 수 없음",
     "Credentials required" : "인증 정보 필요함",
-    "Save" : "저장",
     "Storage with id \"%i\" not found" : "ID가 \"%i\"인 저장소를 찾을 수 없음",
     "Invalid backend or authentication mechanism class" : "백엔드나 인증 방식 클래스가 잘못됨",
     "Invalid mount point" : "잘못된 마운트 지점",
diff --git a/apps/files_external/l10n/nb_NO.js b/apps/files_external/l10n/nb_NO.js
index b197f81d600..97ada915003 100644
--- a/apps/files_external/l10n/nb_NO.js
+++ b/apps/files_external/l10n/nb_NO.js
@@ -18,6 +18,7 @@ OC.L10N.register(
     "(group)" : "(gruppe)",
     "Admin defined" : "Admin-definert",
     "Saved" : "Lagret",
+    "Save" : "Lagre",
     "Empty response from the server" : "Tomt svar fra serveren",
     "Couldn't access. Please logout and login to activate this mount point" : "Fikk ikke tilgang. Vennligst logg ut og inn igjen for å aktivere dette oppkoblingspunktet.",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "Klarte ikke å hente informasjon fra ownCloud-serveren: {code} {type}",
@@ -33,7 +34,6 @@ OC.L10N.register(
     "Credentials saved" : "Påloggingsdetaljer lagret",
     "Credentials saving failed" : "Lagring av påloggingsdetaljer feilet",
     "Credentials required" : "Påloggingsdetaljer kreves",
-    "Save" : "Lagre",
     "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",
diff --git a/apps/files_external/l10n/nb_NO.json b/apps/files_external/l10n/nb_NO.json
index b7373d7cf2d..35923dd6e74 100644
--- a/apps/files_external/l10n/nb_NO.json
+++ b/apps/files_external/l10n/nb_NO.json
@@ -16,6 +16,7 @@
     "(group)" : "(gruppe)",
     "Admin defined" : "Admin-definert",
     "Saved" : "Lagret",
+    "Save" : "Lagre",
     "Empty response from the server" : "Tomt svar fra serveren",
     "Couldn't access. Please logout and login to activate this mount point" : "Fikk ikke tilgang. Vennligst logg ut og inn igjen for å aktivere dette oppkoblingspunktet.",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "Klarte ikke å hente informasjon fra ownCloud-serveren: {code} {type}",
@@ -31,7 +32,6 @@
     "Credentials saved" : "Påloggingsdetaljer lagret",
     "Credentials saving failed" : "Lagring av påloggingsdetaljer feilet",
     "Credentials required" : "Påloggingsdetaljer kreves",
-    "Save" : "Lagre",
     "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",
diff --git a/apps/files_external/l10n/nl.js b/apps/files_external/l10n/nl.js
index 26ff4881eb3..382f5fbd0b5 100644
--- a/apps/files_external/l10n/nl.js
+++ b/apps/files_external/l10n/nl.js
@@ -1,8 +1,8 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Ophalen aanvraag tokens mislukt. Verifieer dat uw app sleutel en geheime sleutel juist zijn.",
-    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Ophalen toegangstokens mislukt. Verifieer dat uw app sleutel en geheime sleutel juist zijn.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Ophalen aanvraag tokens mislukt. Verifieer dat je 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 je 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",
@@ -21,6 +21,8 @@ OC.L10N.register(
     "Compatibility with Mac NFD encoding (slow)" : "Compatibiliteit met Mac NFD encoding (traag)",
     "Admin defined" : "Beheerder gedefinieerd",
     "Saved" : "Bewaard",
+    "Saving..." : "Bewaren...",
+    "Save" : "Bewaren",
     "Empty response from the server" : "Lege reactie van de server",
     "Couldn't access. Please logout and login to activate this mount point" : "Geen toegang. Log uit en opnieuw in om dit koppelpunt te activeren",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "Kon geen informatie van de ownCloud server krijgen: {code} {type}",
@@ -36,7 +38,6 @@ OC.L10N.register(
     "Credentials saved" : "Inloggegevens opgeslagen",
     "Credentials saving failed" : "Opslaan inloggegevens mislukt",
     "Credentials required" : "Inloggegevens vereist",
-    "Save" : "Bewaren",
     "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",
@@ -64,8 +65,11 @@ OC.L10N.register(
     "Identity endpoint URL" : "Identiteiten endpoint URL",
     "Rackspace" : "Rackspace",
     "API key" : "API sleutel",
+    "Global Credentials" : "Algemene inloggegevens",
+    "Log-in credentials, save in database" : "Inloggegevens, bewaren in de database",
     "Username and password" : "Gebruikersnaam en wachtwoord",
     "Log-in credentials, save in session" : "Inloggegevens, opslaan in sessie",
+    "User entered, store in database" : "Gebruiker opgegeven, opslaan in de database",
     "RSA public key" : "RSA publieke sleutel",
     "Public key" : "Publieke sleutel",
     "Amazon S3" : "Amazon S3",
@@ -99,11 +103,11 @@ OC.L10N.register(
     "Service name" : "Servicenaam",
     "Request timeout (seconds)" : "Aanvraag time-out (seconds)",
     "<b>Note:</b> " : "<b>Let op:</b> ",
-    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Let op:</b> Curl ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw systeembeheerder dit te installeren.",
-    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Let op:</b> FTP ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw beheerder dit te installeren.",
+    "<b>Note:</b> The 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 je 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 je 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.",
     "No external storage configured" : "Geen externe opslag geconfigureerd",
-    "You can add external storages in the personal settings" : "U kunt externe opslag toevogene in persoonlijke instellingen",
+    "You can add external storages in the personal settings" : "Je kunt externe opslag toevoegen in persoonlijke instellingen",
     "Name" : "Naam",
     "Storage type" : "Opslagtype",
     "Scope" : "Scope",
diff --git a/apps/files_external/l10n/nl.json b/apps/files_external/l10n/nl.json
index 958d1f7059c..42a0393a8f6 100644
--- a/apps/files_external/l10n/nl.json
+++ b/apps/files_external/l10n/nl.json
@@ -1,6 +1,6 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Ophalen aanvraag tokens mislukt. Verifieer dat uw app sleutel en geheime sleutel juist zijn.",
-    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Ophalen toegangstokens mislukt. Verifieer dat uw app sleutel en geheime sleutel juist zijn.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Ophalen aanvraag tokens mislukt. Verifieer dat je 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 je 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",
@@ -19,6 +19,8 @@
     "Compatibility with Mac NFD encoding (slow)" : "Compatibiliteit met Mac NFD encoding (traag)",
     "Admin defined" : "Beheerder gedefinieerd",
     "Saved" : "Bewaard",
+    "Saving..." : "Bewaren...",
+    "Save" : "Bewaren",
     "Empty response from the server" : "Lege reactie van de server",
     "Couldn't access. Please logout and login to activate this mount point" : "Geen toegang. Log uit en opnieuw in om dit koppelpunt te activeren",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "Kon geen informatie van de ownCloud server krijgen: {code} {type}",
@@ -34,7 +36,6 @@
     "Credentials saved" : "Inloggegevens opgeslagen",
     "Credentials saving failed" : "Opslaan inloggegevens mislukt",
     "Credentials required" : "Inloggegevens vereist",
-    "Save" : "Bewaren",
     "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",
@@ -62,8 +63,11 @@
     "Identity endpoint URL" : "Identiteiten endpoint URL",
     "Rackspace" : "Rackspace",
     "API key" : "API sleutel",
+    "Global Credentials" : "Algemene inloggegevens",
+    "Log-in credentials, save in database" : "Inloggegevens, bewaren in de database",
     "Username and password" : "Gebruikersnaam en wachtwoord",
     "Log-in credentials, save in session" : "Inloggegevens, opslaan in sessie",
+    "User entered, store in database" : "Gebruiker opgegeven, opslaan in de database",
     "RSA public key" : "RSA publieke sleutel",
     "Public key" : "Publieke sleutel",
     "Amazon S3" : "Amazon S3",
@@ -97,11 +101,11 @@
     "Service name" : "Servicenaam",
     "Request timeout (seconds)" : "Aanvraag time-out (seconds)",
     "<b>Note:</b> " : "<b>Let op:</b> ",
-    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Let op:</b> Curl ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw systeembeheerder dit te installeren.",
-    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Let op:</b> FTP ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw beheerder dit te installeren.",
+    "<b>Note:</b> The 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 je 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 je 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.",
     "No external storage configured" : "Geen externe opslag geconfigureerd",
-    "You can add external storages in the personal settings" : "U kunt externe opslag toevogene in persoonlijke instellingen",
+    "You can add external storages in the personal settings" : "Je kunt externe opslag toevoegen in persoonlijke instellingen",
     "Name" : "Naam",
     "Storage type" : "Opslagtype",
     "Scope" : "Scope",
diff --git a/apps/files_external/l10n/pt_BR.js b/apps/files_external/l10n/pt_BR.js
index d77d9d6db9f..39a6e766677 100644
--- a/apps/files_external/l10n/pt_BR.js
+++ b/apps/files_external/l10n/pt_BR.js
@@ -21,6 +21,8 @@ OC.L10N.register(
     "Compatibility with Mac NFD encoding (slow)" : "Compatibilidade com a codificação Mac NFD (lento)",
     "Admin defined" : "Definido pelo administrador",
     "Saved" : "Salvo",
+    "Saving..." : "Salvando...",
+    "Save" : "Salvar",
     "Empty response from the server" : "Resposta vazia a partir do servidor",
     "Couldn't access. Please logout and login to activate this mount point" : "Não foi possível acessar. Por favor, desconectar e conectar novamente para ativar este ponto de montagem",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "Não foi possível obter as informações do servidor ownCloud: {code} {type}",
@@ -36,7 +38,6 @@ OC.L10N.register(
     "Credentials saved" : "Credenciais salvas",
     "Credentials saving failed" : "A gravação das credenciais falhou",
     "Credentials required" : "Credenciais são exigidas",
-    "Save" : "Salvar",
     "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",
@@ -64,8 +65,11 @@ OC.L10N.register(
     "Identity endpoint URL" : "Identidade pontofinal URL",
     "Rackspace" : "Espaço em rack",
     "API key" : "Chave API",
+    "Global Credentials" : "Credenciais Globais",
+    "Log-in credentials, save in database" : "Credenciais de acesso, salvas no banco de dados",
     "Username and password" : "Nome de Usuário e senha",
     "Log-in credentials, save in session" : "Credenciais de login, guardados em sessão",
+    "User entered, store in database" : "Usuário adicionado, armazenado no banco de dados",
     "RSA public key" : "Chave pública RSA",
     "Public key" : "Chave pública",
     "Amazon S3" : "Amazon S3",
diff --git a/apps/files_external/l10n/pt_BR.json b/apps/files_external/l10n/pt_BR.json
index 5bdcdeaf68f..7d6a3b5b10d 100644
--- a/apps/files_external/l10n/pt_BR.json
+++ b/apps/files_external/l10n/pt_BR.json
@@ -19,6 +19,8 @@
     "Compatibility with Mac NFD encoding (slow)" : "Compatibilidade com a codificação Mac NFD (lento)",
     "Admin defined" : "Definido pelo administrador",
     "Saved" : "Salvo",
+    "Saving..." : "Salvando...",
+    "Save" : "Salvar",
     "Empty response from the server" : "Resposta vazia a partir do servidor",
     "Couldn't access. Please logout and login to activate this mount point" : "Não foi possível acessar. Por favor, desconectar e conectar novamente para ativar este ponto de montagem",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "Não foi possível obter as informações do servidor ownCloud: {code} {type}",
@@ -34,7 +36,6 @@
     "Credentials saved" : "Credenciais salvas",
     "Credentials saving failed" : "A gravação das credenciais falhou",
     "Credentials required" : "Credenciais são exigidas",
-    "Save" : "Salvar",
     "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",
@@ -62,8 +63,11 @@
     "Identity endpoint URL" : "Identidade pontofinal URL",
     "Rackspace" : "Espaço em rack",
     "API key" : "Chave API",
+    "Global Credentials" : "Credenciais Globais",
+    "Log-in credentials, save in database" : "Credenciais de acesso, salvas no banco de dados",
     "Username and password" : "Nome de Usuário e senha",
     "Log-in credentials, save in session" : "Credenciais de login, guardados em sessão",
+    "User entered, store in database" : "Usuário adicionado, armazenado no banco de dados",
     "RSA public key" : "Chave pública RSA",
     "Public key" : "Chave pública",
     "Amazon S3" : "Amazon S3",
diff --git a/apps/files_external/l10n/pt_PT.js b/apps/files_external/l10n/pt_PT.js
index 68f183a36b3..6bb0aad5ed8 100644
--- a/apps/files_external/l10n/pt_PT.js
+++ b/apps/files_external/l10n/pt_PT.js
@@ -21,6 +21,7 @@ OC.L10N.register(
     "Compatibility with Mac NFD encoding (slow)" : "Compatibilidade com a codificação NFD Mac (lenta)",
     "Admin defined" : "Administrador definido",
     "Saved" : "Guardado",
+    "Save" : "Guardar",
     "Empty response from the server" : "Resposta vazia a partir do servidor",
     "Couldn't access. Please logout and login to activate this mount point" : "Não foi possível aceder. Por favor, faça logout e login para ativar este ponto de montagem",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "Não foi possível recolher a informação do servidor ownCloud: {code} {type}",
@@ -36,7 +37,6 @@ OC.L10N.register(
     "Credentials saved" : "Credenciais guardadas",
     "Credentials saving failed" : "Falha ao guardar as credenciais",
     "Credentials required" : "Credenciais necessárias",
-    "Save" : "Guardar",
     "Storage with id \"%i\" not found" : "Não foi encontrado o armazenamento com a id. \"%i\"",
     "Invalid backend or authentication mechanism class" : "Parâmetros do mecanismo de autenticação inválidos",
     "Invalid mount point" : "Ponto de montagem inválido",
diff --git a/apps/files_external/l10n/pt_PT.json b/apps/files_external/l10n/pt_PT.json
index 93922c67762..a6cc044ef6b 100644
--- a/apps/files_external/l10n/pt_PT.json
+++ b/apps/files_external/l10n/pt_PT.json
@@ -19,6 +19,7 @@
     "Compatibility with Mac NFD encoding (slow)" : "Compatibilidade com a codificação NFD Mac (lenta)",
     "Admin defined" : "Administrador definido",
     "Saved" : "Guardado",
+    "Save" : "Guardar",
     "Empty response from the server" : "Resposta vazia a partir do servidor",
     "Couldn't access. Please logout and login to activate this mount point" : "Não foi possível aceder. Por favor, faça logout e login para ativar este ponto de montagem",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "Não foi possível recolher a informação do servidor ownCloud: {code} {type}",
@@ -34,7 +35,6 @@
     "Credentials saved" : "Credenciais guardadas",
     "Credentials saving failed" : "Falha ao guardar as credenciais",
     "Credentials required" : "Credenciais necessárias",
-    "Save" : "Guardar",
     "Storage with id \"%i\" not found" : "Não foi encontrado o armazenamento com a id. \"%i\"",
     "Invalid backend or authentication mechanism class" : "Parâmetros do mecanismo de autenticação inválidos",
     "Invalid mount point" : "Ponto de montagem inválido",
diff --git a/apps/files_external/l10n/ru.js b/apps/files_external/l10n/ru.js
index 54feb58fcd9..331a29da267 100644
--- a/apps/files_external/l10n/ru.js
+++ b/apps/files_external/l10n/ru.js
@@ -21,6 +21,7 @@ OC.L10N.register(
     "Compatibility with Mac NFD encoding (slow)" : "Совместимость с кодировкой Mac NFD (медленно)",
     "Admin defined" : "Определено админом",
     "Saved" : "Сохранено",
+    "Save" : "Сохранить",
     "Empty response from the server" : "Пустой ответ от сервера",
     "Couldn't access. Please logout and login to activate this mount point" : "Не удалось получить доступ. Пожалуйста, выйти и войдите чтобы активировать эту точку монтирования",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "Не удалось получить информацию от сервера OwnCloud: {code} {type}",
@@ -36,7 +37,6 @@ OC.L10N.register(
     "Credentials saved" : "Учетные данные сохранены",
     "Credentials saving failed" : "Ошибка сохранения учетных данных",
     "Credentials required" : "Требуются учетные данные",
-    "Save" : "Сохранить",
     "Storage with id \"%i\" not found" : "Хранилище с идентификатором \"%i\" не найдено",
     "Invalid backend or authentication mechanism class" : "Некорректный механизм авторизации или бэкенд",
     "Invalid mount point" : "Неправильная точка входа",
diff --git a/apps/files_external/l10n/ru.json b/apps/files_external/l10n/ru.json
index 42085cd81f1..d3b36499f56 100644
--- a/apps/files_external/l10n/ru.json
+++ b/apps/files_external/l10n/ru.json
@@ -19,6 +19,7 @@
     "Compatibility with Mac NFD encoding (slow)" : "Совместимость с кодировкой Mac NFD (медленно)",
     "Admin defined" : "Определено админом",
     "Saved" : "Сохранено",
+    "Save" : "Сохранить",
     "Empty response from the server" : "Пустой ответ от сервера",
     "Couldn't access. Please logout and login to activate this mount point" : "Не удалось получить доступ. Пожалуйста, выйти и войдите чтобы активировать эту точку монтирования",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "Не удалось получить информацию от сервера OwnCloud: {code} {type}",
@@ -34,7 +35,6 @@
     "Credentials saved" : "Учетные данные сохранены",
     "Credentials saving failed" : "Ошибка сохранения учетных данных",
     "Credentials required" : "Требуются учетные данные",
-    "Save" : "Сохранить",
     "Storage with id \"%i\" not found" : "Хранилище с идентификатором \"%i\" не найдено",
     "Invalid backend or authentication mechanism class" : "Некорректный механизм авторизации или бэкенд",
     "Invalid mount point" : "Неправильная точка входа",
diff --git a/apps/files_external/l10n/sk_SK.js b/apps/files_external/l10n/sk_SK.js
index a2d868a38d8..3c09c430e3f 100644
--- a/apps/files_external/l10n/sk_SK.js
+++ b/apps/files_external/l10n/sk_SK.js
@@ -17,9 +17,9 @@ OC.L10N.register(
     "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é",
+    "Save" : "Uložiť",
     "Username" : "Používateľské meno",
     "Password" : "Heslo",
-    "Save" : "Uložiť",
     "Storage with id \"%i\" not found" : "Úložisko s ID \"%i\" sa nenašlo",
     "Invalid backend or authentication mechanism class" : "Neplatný backend, prípadne trieda mechanizmu autentifikácie",
     "Invalid mount point" : "Chybný prípojný bod",
diff --git a/apps/files_external/l10n/sk_SK.json b/apps/files_external/l10n/sk_SK.json
index 0385633c851..96d4f2f5aa9 100644
--- a/apps/files_external/l10n/sk_SK.json
+++ b/apps/files_external/l10n/sk_SK.json
@@ -15,9 +15,9 @@
     "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é",
+    "Save" : "Uložiť",
     "Username" : "Používateľské meno",
     "Password" : "Heslo",
-    "Save" : "Uložiť",
     "Storage with id \"%i\" not found" : "Úložisko s ID \"%i\" sa nenašlo",
     "Invalid backend or authentication mechanism class" : "Neplatný backend, prípadne trieda mechanizmu autentifikácie",
     "Invalid mount point" : "Chybný prípojný bod",
diff --git a/apps/files_external/l10n/sl.js b/apps/files_external/l10n/sl.js
index 4b8be728155..6568c8b2526 100644
--- a/apps/files_external/l10n/sl.js
+++ b/apps/files_external/l10n/sl.js
@@ -18,9 +18,11 @@ OC.L10N.register(
     "Error generating key pair" : "Prišlo je do napake med ustvarjanjem para ključev",
     "All users. Type to select user or group." : "Vsi uporabniki. Skupino ali uporabnika je mogoče tudi izbrati.",
     "(group)" : "(skupina)",
-    "Compatibility with Mac NFD encoding (slow)" : "Usklajenost z Mac NFD šifriranjem (počasno)",
+    "Compatibility with Mac NFD encoding (slow)" : " Usklajenost z Mac NFD šifriranjem (počasno)",
     "Admin defined" : "Skrbnik je določen",
     "Saved" : "Shranjeno",
+    "Saving..." : "Shranjujem...",
+    "Save" : "Shrani",
     "Empty response from the server" : "S strežnika je prejet odziv brez vsebine.",
     "Couldn't access. Please logout and login to activate this mount point" : "Dostop ni mogoč. Za priklop točke se odjavite in ponovno prijavite.",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "Ni mogoče pridobiti podrobnosti s strežnika ownCloud:{koda} {vrsta}",
@@ -36,7 +38,6 @@ OC.L10N.register(
     "Credentials saved" : "Poverila so shranjena",
     "Credentials saving failed" : "Shranjevanje poveril je spodletelo",
     "Credentials required" : "Zahtevana so poverila",
-    "Save" : "Shrani",
     "Storage with id \"%i\" not found" : "Shrambe z ID \"%i\" ni mogoče najti.",
     "Invalid backend or authentication mechanism class" : "Neveljaven ozadnji program oziroma razred mehanizma overitve",
     "Invalid mount point" : "Neveljavna priklopna točka",
@@ -64,8 +65,11 @@ OC.L10N.register(
     "Identity endpoint URL" : "Naslov URL končne točke istovetnosti",
     "Rackspace" : "Rackspace",
     "API key" : "Ključ API",
+    "Global Credentials" : "Globalne poverilnice",
+    "Log-in credentials, save in database" : "Prijavne poverilnice, shrani v bazo",
     "Username and password" : "Uporabniško ime in geslo",
     "Log-in credentials, save in session" : "Prijavna poverila, shrani v seji",
+    "User entered, store in database" : "Uporabnik vnešen, vpis v bazo",
     "RSA public key" : "Javni ključ RSA",
     "Public key" : "Javni ključ",
     "Amazon S3" : "Amazon S3",
diff --git a/apps/files_external/l10n/sl.json b/apps/files_external/l10n/sl.json
index 26648ce76df..f332aedb51c 100644
--- a/apps/files_external/l10n/sl.json
+++ b/apps/files_external/l10n/sl.json
@@ -16,9 +16,11 @@
     "Error generating key pair" : "Prišlo je do napake med ustvarjanjem para ključev",
     "All users. Type to select user or group." : "Vsi uporabniki. Skupino ali uporabnika je mogoče tudi izbrati.",
     "(group)" : "(skupina)",
-    "Compatibility with Mac NFD encoding (slow)" : "Usklajenost z Mac NFD šifriranjem (počasno)",
+    "Compatibility with Mac NFD encoding (slow)" : " Usklajenost z Mac NFD šifriranjem (počasno)",
     "Admin defined" : "Skrbnik je določen",
     "Saved" : "Shranjeno",
+    "Saving..." : "Shranjujem...",
+    "Save" : "Shrani",
     "Empty response from the server" : "S strežnika je prejet odziv brez vsebine.",
     "Couldn't access. Please logout and login to activate this mount point" : "Dostop ni mogoč. Za priklop točke se odjavite in ponovno prijavite.",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "Ni mogoče pridobiti podrobnosti s strežnika ownCloud:{koda} {vrsta}",
@@ -34,7 +36,6 @@
     "Credentials saved" : "Poverila so shranjena",
     "Credentials saving failed" : "Shranjevanje poveril je spodletelo",
     "Credentials required" : "Zahtevana so poverila",
-    "Save" : "Shrani",
     "Storage with id \"%i\" not found" : "Shrambe z ID \"%i\" ni mogoče najti.",
     "Invalid backend or authentication mechanism class" : "Neveljaven ozadnji program oziroma razred mehanizma overitve",
     "Invalid mount point" : "Neveljavna priklopna točka",
@@ -62,8 +63,11 @@
     "Identity endpoint URL" : "Naslov URL končne točke istovetnosti",
     "Rackspace" : "Rackspace",
     "API key" : "Ključ API",
+    "Global Credentials" : "Globalne poverilnice",
+    "Log-in credentials, save in database" : "Prijavne poverilnice, shrani v bazo",
     "Username and password" : "Uporabniško ime in geslo",
     "Log-in credentials, save in session" : "Prijavna poverila, shrani v seji",
+    "User entered, store in database" : "Uporabnik vnešen, vpis v bazo",
     "RSA public key" : "Javni ključ RSA",
     "Public key" : "Javni ključ",
     "Amazon S3" : "Amazon S3",
diff --git a/apps/files_external/l10n/sq.js b/apps/files_external/l10n/sq.js
index 43651a9ea0c..fa0179cfa28 100644
--- a/apps/files_external/l10n/sq.js
+++ b/apps/files_external/l10n/sq.js
@@ -21,6 +21,7 @@ OC.L10N.register(
     "Compatibility with Mac NFD encoding (slow)" : "Pëerputhshmëri me kodim Mac NFD (e ngadaltë)",
     "Admin defined" : "Përcaktuar nga përgjegjësi",
     "Saved" : "U ruajt",
+    "Save" : "Ruaje",
     "Empty response from the server" : "Përgjigje e zbrazët prej shërbyesit",
     "Couldn't access. Please logout and login to activate this mount point" : "S’fut dot. Ju lutemi, dilni dhe hyni që të aktivizohet kjo pikë montimi",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "S’u morën dot të dhëna nga shërbyesi ownCloud: {code} {type}",
@@ -36,7 +37,6 @@ OC.L10N.register(
     "Credentials saved" : "Kredencialet u ruajtën",
     "Credentials saving failed" : "Ruajtja e kredencialeve dështoi",
     "Credentials required" : "Lypsen kredenciale",
-    "Save" : "Ruaje",
     "Storage with id \"%i\" not found" : "S’u gjet depozitë me id \"%i\"",
     "Invalid backend or authentication mechanism class" : "Mekanizëm shërbimi ose klasë mekanizmi mirëfilltësimi e palvefshme",
     "Invalid mount point" : "Pikë montimi e pavlefshme",
diff --git a/apps/files_external/l10n/sq.json b/apps/files_external/l10n/sq.json
index eeb85502ad5..baa13edaf5c 100644
--- a/apps/files_external/l10n/sq.json
+++ b/apps/files_external/l10n/sq.json
@@ -19,6 +19,7 @@
     "Compatibility with Mac NFD encoding (slow)" : "Pëerputhshmëri me kodim Mac NFD (e ngadaltë)",
     "Admin defined" : "Përcaktuar nga përgjegjësi",
     "Saved" : "U ruajt",
+    "Save" : "Ruaje",
     "Empty response from the server" : "Përgjigje e zbrazët prej shërbyesit",
     "Couldn't access. Please logout and login to activate this mount point" : "S’fut dot. Ju lutemi, dilni dhe hyni që të aktivizohet kjo pikë montimi",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "S’u morën dot të dhëna nga shërbyesi ownCloud: {code} {type}",
@@ -34,7 +35,6 @@
     "Credentials saved" : "Kredencialet u ruajtën",
     "Credentials saving failed" : "Ruajtja e kredencialeve dështoi",
     "Credentials required" : "Lypsen kredenciale",
-    "Save" : "Ruaje",
     "Storage with id \"%i\" not found" : "S’u gjet depozitë me id \"%i\"",
     "Invalid backend or authentication mechanism class" : "Mekanizëm shërbimi ose klasë mekanizmi mirëfilltësimi e palvefshme",
     "Invalid mount point" : "Pikë montimi e pavlefshme",
diff --git a/apps/files_external/l10n/sv.js b/apps/files_external/l10n/sv.js
index 3df7763a5fe..a66a22ae595 100644
--- a/apps/files_external/l10n/sv.js
+++ b/apps/files_external/l10n/sv.js
@@ -14,6 +14,7 @@ OC.L10N.register(
     "(group)" : "(grupp)",
     "Admin defined" : "Admin definerad",
     "Saved" : "Sparad",
+    "Save" : "Spara",
     "Empty response from the server" : "Tomt svar från servern",
     "Couldn't get the list of external mount points: {type}" : "Kunde inte hämta listan för externa monteringspunkter: {type}",
     "There was an error with message: " : "Det fanns ett fel med meddelande:",
@@ -24,7 +25,6 @@ OC.L10N.register(
     "Credentials saved" : "Sparade referenser",
     "Credentials saving failed" : "Misslyckades med att spara referenser",
     "Credentials required" : "Referenser krävs",
-    "Save" : "Spara",
     "Invalid mount point" : "Ogiltig monteringspunkt",
     "Insufficient data: %s" : "Otillräcklig data: %s",
     "%s" : "%s",
diff --git a/apps/files_external/l10n/sv.json b/apps/files_external/l10n/sv.json
index 1070a322e92..1bfca8f1f50 100644
--- a/apps/files_external/l10n/sv.json
+++ b/apps/files_external/l10n/sv.json
@@ -12,6 +12,7 @@
     "(group)" : "(grupp)",
     "Admin defined" : "Admin definerad",
     "Saved" : "Sparad",
+    "Save" : "Spara",
     "Empty response from the server" : "Tomt svar från servern",
     "Couldn't get the list of external mount points: {type}" : "Kunde inte hämta listan för externa monteringspunkter: {type}",
     "There was an error with message: " : "Det fanns ett fel med meddelande:",
@@ -22,7 +23,6 @@
     "Credentials saved" : "Sparade referenser",
     "Credentials saving failed" : "Misslyckades med att spara referenser",
     "Credentials required" : "Referenser krävs",
-    "Save" : "Spara",
     "Invalid mount point" : "Ogiltig monteringspunkt",
     "Insufficient data: %s" : "Otillräcklig data: %s",
     "%s" : "%s",
diff --git a/apps/files_external/l10n/th_TH.js b/apps/files_external/l10n/th_TH.js
index 8028ec77b06..4915d38c7f1 100644
--- a/apps/files_external/l10n/th_TH.js
+++ b/apps/files_external/l10n/th_TH.js
@@ -18,6 +18,7 @@ OC.L10N.register(
     "(group)" : "(กลุ่ม)",
     "Admin defined" : "ถูกกำหนดโดยผู้ดูแลระบบ",
     "Saved" : "บันทึกแล้ว",
+    "Save" : "บันทึก",
     "Empty response from the server" : "ไม่มีการตอบสนองจากเซิร์ฟเวอร์",
     "Couldn't access. Please logout and login to activate this mount point" : "ไม่สามารถเข้าถึง กรุณออกจากระบบและาเข้าสู่ระบบใหม่เพื่อเปิดใช้งานจุดเชื่อมต่อนี้",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "ไม่สามารถรับข้อมูลจากเซิร์ฟเวอร์ ownCloud: {code} {type}",
@@ -33,7 +34,6 @@ OC.L10N.register(
     "Credentials saved" : "ข้อมูลประจำตัวได้ถูกบันทึก",
     "Credentials saving failed" : "บันทึกข้อมูลประจำตัวล้มเหลว",
     "Credentials required" : "จำเป็นต้องระบบข้อมูลประจำตัว",
-    "Save" : "บันทึก",
     "Storage with id \"%i\" not found" : "ไม่พบจัดการเก็บข้อมูลของ ID \"%i\"",
     "Invalid backend or authentication mechanism class" : "แบ็กเอนด์ไม่ถูกต้องหรือระดับการรับรองความถูกต้องไม่เพียงพอ",
     "Invalid mount point" : "จุดเชื่อมต่อที่ไม่ถูกต้อง",
diff --git a/apps/files_external/l10n/th_TH.json b/apps/files_external/l10n/th_TH.json
index 067e30c562f..acb8c261d95 100644
--- a/apps/files_external/l10n/th_TH.json
+++ b/apps/files_external/l10n/th_TH.json
@@ -16,6 +16,7 @@
     "(group)" : "(กลุ่ม)",
     "Admin defined" : "ถูกกำหนดโดยผู้ดูแลระบบ",
     "Saved" : "บันทึกแล้ว",
+    "Save" : "บันทึก",
     "Empty response from the server" : "ไม่มีการตอบสนองจากเซิร์ฟเวอร์",
     "Couldn't access. Please logout and login to activate this mount point" : "ไม่สามารถเข้าถึง กรุณออกจากระบบและาเข้าสู่ระบบใหม่เพื่อเปิดใช้งานจุดเชื่อมต่อนี้",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "ไม่สามารถรับข้อมูลจากเซิร์ฟเวอร์ ownCloud: {code} {type}",
@@ -31,7 +32,6 @@
     "Credentials saved" : "ข้อมูลประจำตัวได้ถูกบันทึก",
     "Credentials saving failed" : "บันทึกข้อมูลประจำตัวล้มเหลว",
     "Credentials required" : "จำเป็นต้องระบบข้อมูลประจำตัว",
-    "Save" : "บันทึก",
     "Storage with id \"%i\" not found" : "ไม่พบจัดการเก็บข้อมูลของ ID \"%i\"",
     "Invalid backend or authentication mechanism class" : "แบ็กเอนด์ไม่ถูกต้องหรือระดับการรับรองความถูกต้องไม่เพียงพอ",
     "Invalid mount point" : "จุดเชื่อมต่อที่ไม่ถูกต้อง",
diff --git a/apps/files_external/l10n/tr.js b/apps/files_external/l10n/tr.js
index 1f9c41eccb9..4bd6b784bda 100644
--- a/apps/files_external/l10n/tr.js
+++ b/apps/files_external/l10n/tr.js
@@ -18,6 +18,7 @@ OC.L10N.register(
     "(group)" : "(grup)",
     "Admin defined" : "Yönetici tanımlandı",
     "Saved" : "Kaydedildi",
+    "Save" : "Kaydet",
     "Empty response from the server" : "Sunucudan boş yanıt",
     "Couldn't access. Please logout and login to activate this mount point" : "Erişilemedi. Lütfen bu bağlama noktasını etkinleştirmek için tekrar oturumu kapatıp açın.",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "ownCloud sunucusundan bilgi alınamadı: {code} {type}",
@@ -33,7 +34,6 @@ OC.L10N.register(
     "Credentials saved" : "Kimlik bilgileri kaydedildi",
     "Credentials saving failed" : "Kimlik bilgileri kaydedilemedi",
     "Credentials required" : "Kimlik bilgileri gerekli",
-    "Save" : "Kaydet",
     "Storage with id \"%i\" not found" : "\"%i\" kimliği ile bir depolama bulunamadı",
     "Invalid backend or authentication mechanism class" : "Geçersiz arka uç veya kimlik doğrulama mekanizma sınıfı",
     "Invalid mount point" : "Geçersiz bağlama noktası",
diff --git a/apps/files_external/l10n/tr.json b/apps/files_external/l10n/tr.json
index ec68bd7447e..55fb3df86f2 100644
--- a/apps/files_external/l10n/tr.json
+++ b/apps/files_external/l10n/tr.json
@@ -16,6 +16,7 @@
     "(group)" : "(grup)",
     "Admin defined" : "Yönetici tanımlandı",
     "Saved" : "Kaydedildi",
+    "Save" : "Kaydet",
     "Empty response from the server" : "Sunucudan boş yanıt",
     "Couldn't access. Please logout and login to activate this mount point" : "Erişilemedi. Lütfen bu bağlama noktasını etkinleştirmek için tekrar oturumu kapatıp açın.",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "ownCloud sunucusundan bilgi alınamadı: {code} {type}",
@@ -31,7 +32,6 @@
     "Credentials saved" : "Kimlik bilgileri kaydedildi",
     "Credentials saving failed" : "Kimlik bilgileri kaydedilemedi",
     "Credentials required" : "Kimlik bilgileri gerekli",
-    "Save" : "Kaydet",
     "Storage with id \"%i\" not found" : "\"%i\" kimliği ile bir depolama bulunamadı",
     "Invalid backend or authentication mechanism class" : "Geçersiz arka uç veya kimlik doğrulama mekanizma sınıfı",
     "Invalid mount point" : "Geçersiz bağlama noktası",
diff --git a/apps/files_external/l10n/zh_TW.js b/apps/files_external/l10n/zh_TW.js
index 45fe08682a6..f3a188ceebf 100644
--- a/apps/files_external/l10n/zh_TW.js
+++ b/apps/files_external/l10n/zh_TW.js
@@ -17,13 +17,13 @@ OC.L10N.register(
     "All users. Type to select user or group." : "所有人都可以使用，或者選擇特定使用者、群組",
     "(group)" : "(群組)",
     "Saved" : "已儲存",
+    "Save" : "儲存",
     "Couldn't access. Please logout and login to activate this mount point" : "無法存取。請重新登出再登入啟動此掛載點。",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "無法從ownCloud伺服器得到資訊: {code} {type}",
     "Couldn't get the list of external mount points: {type}" : "無法得到外部掛載點的列表: {type}",
     "External mount error" : "外部掛載錯誤",
     "Username" : "使用者名稱",
     "Password" : "密碼",
-    "Save" : "儲存",
     "Storage with id \"%i\" not found" : "沒有找到編號 \"%i\" 的儲存空間 ",
     "Invalid backend or authentication mechanism class" : "無效的後端處理或是驗證方式",
     "Invalid mount point" : "無效的掛載點",
diff --git a/apps/files_external/l10n/zh_TW.json b/apps/files_external/l10n/zh_TW.json
index 4e487f06a3a..42e575d24cd 100644
--- a/apps/files_external/l10n/zh_TW.json
+++ b/apps/files_external/l10n/zh_TW.json
@@ -15,13 +15,13 @@
     "All users. Type to select user or group." : "所有人都可以使用，或者選擇特定使用者、群組",
     "(group)" : "(群組)",
     "Saved" : "已儲存",
+    "Save" : "儲存",
     "Couldn't access. Please logout and login to activate this mount point" : "無法存取。請重新登出再登入啟動此掛載點。",
     "Couldn't get the information from the ownCloud server: {code} {type}" : "無法從ownCloud伺服器得到資訊: {code} {type}",
     "Couldn't get the list of external mount points: {type}" : "無法得到外部掛載點的列表: {type}",
     "External mount error" : "外部掛載錯誤",
     "Username" : "使用者名稱",
     "Password" : "密碼",
-    "Save" : "儲存",
     "Storage with id \"%i\" not found" : "沒有找到編號 \"%i\" 的儲存空間 ",
     "Invalid backend or authentication mechanism class" : "無效的後端處理或是驗證方式",
     "Invalid mount point" : "無效的掛載點",
diff --git a/apps/files_external/lib/AppInfo/Application.php b/apps/files_external/lib/AppInfo/Application.php
index b2eaf225e9e..0ee4e9b3d5c 100644
--- a/apps/files_external/lib/AppInfo/Application.php
+++ b/apps/files_external/lib/AppInfo/Application.php
@@ -116,6 +116,9 @@ class Application extends App implements IBackendProvider, IAuthMechanismProvide
 			// AuthMechanism::SCHEME_PASSWORD mechanisms
 			$container->query('OCA\Files_External\Lib\Auth\Password\Password'),
 			$container->query('OCA\Files_External\Lib\Auth\Password\SessionCredentials'),
+			$container->query('OCA\Files_External\Lib\Auth\Password\LoginCredentials'),
+			$container->query('OCA\Files_External\Lib\Auth\Password\UserProvided'),
+			$container->query('OCA\Files_External\Lib\Auth\Password\GlobalAuth'),
 
 			// AuthMechanism::SCHEME_OAUTH1 mechanisms
 			$container->query('OCA\Files_External\Lib\Auth\OAuth1\OAuth1'),
diff --git a/apps/files_external/lib/Controller/AjaxController.php b/apps/files_external/lib/Controller/AjaxController.php
index c3df3fa8522..068abbb809d 100644
--- a/apps/files_external/lib/Controller/AjaxController.php
+++ b/apps/files_external/lib/Controller/AjaxController.php
@@ -24,20 +24,50 @@
 
 namespace OCA\Files_External\Controller;
 
+use OCA\Files_External\Lib\Auth\Password\GlobalAuth;
 use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\Response;
+use OCP\IGroupManager;
 use OCP\IRequest;
 use OCP\AppFramework\Http\JSONResponse;
 use OCA\Files_External\Lib\Auth\PublicKey\RSA;
+use OCP\IUserSession;
 
 class AjaxController extends Controller {
 	/** @var RSA */
 	private $rsaMechanism;
+	/** @var GlobalAuth  */
+	private $globalAuth;
+	/** @var IUserSession */
+	private $userSession;
+	/** @var IGroupManager */
+	private $groupManager;
 
-	public function __construct($appName, IRequest $request, RSA $rsaMechanism) {
+	/**
+	 * @param string $appName
+	 * @param IRequest $request
+	 * @param RSA $rsaMechanism
+	 * @param GlobalAuth $globalAuth
+	 * @param IUserSession $userSession
+	 * @param IGroupManager $groupManager
+	 */
+	public function __construct($appName,
+								IRequest $request,
+								RSA $rsaMechanism,
+								GlobalAuth $globalAuth,
+								IUserSession $userSession,
+								IGroupManager $groupManager) {
 		parent::__construct($appName, $request);
 		$this->rsaMechanism = $rsaMechanism;
+		$this->globalAuth = $globalAuth;
+		$this->userSession = $userSession;
+		$this->groupManager = $groupManager;
 	}
 
+	/**
+	 * @return array
+	 */
 	private function generateSshKeys() {
 		$key = $this->rsaMechanism->createKey();
 		// Replace the placeholder label with a more meaningful one
@@ -61,4 +91,28 @@ class AjaxController extends Controller {
 			'status' => 'success'
 		));
 	}
+
+	/**
+	 * @NoAdminRequired
+	 *
+	 * @param string $uid
+	 * @param string $user
+	 * @param string $password
+	 * @return bool
+	 */
+	public function saveGlobalCredentials($uid, $user, $password) {
+		$currentUser = $this->userSession->getUser();
+
+		// Non-admins can only edit their own credentials
+		$allowedToEdit = (
+			$this->groupManager->isAdmin($currentUser->getUID()) || $currentUser->getUID() === $uid
+		) ? true : false;
+
+		if ($allowedToEdit) {
+			$this->globalAuth->saveAuth($uid, $user, $password);
+			return true;
+		} else {
+			return false;
+		}
+	}
 }
diff --git a/apps/files_external/lib/Lib/Auth/Password/GlobalAuth.php b/apps/files_external/lib/Lib/Auth/Password/GlobalAuth.php
new file mode 100644
index 00000000000..5fa4dc5d1d4
--- /dev/null
+++ b/apps/files_external/lib/Lib/Auth/Password/GlobalAuth.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * @author Robin Appelman <icewind@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_External\Lib\Auth\Password;
+
+use OCA\Files_External\Service\BackendService;
+use OCP\IL10N;
+use OCP\IUser;
+use OCA\Files_External\Lib\Auth\AuthMechanism;
+use OCA\Files_External\Lib\StorageConfig;
+use OCP\Security\ICredentialsManager;
+use OCP\Files\Storage;
+use OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException;
+
+/**
+ * Global Username and Password
+ */
+class GlobalAuth extends AuthMechanism {
+
+	const CREDENTIALS_IDENTIFIER = 'password::global';
+
+	/** @var ICredentialsManager */
+	protected $credentialsManager;
+
+	public function __construct(IL10N $l, ICredentialsManager $credentialsManager) {
+		$this->credentialsManager = $credentialsManager;
+
+		$this
+			->setIdentifier('password::global')
+			->setVisibility(BackendService::VISIBILITY_DEFAULT)
+			->setScheme(self::SCHEME_PASSWORD)
+			->setText($l->t('Global Credentials'));
+	}
+
+	public function getAuth($uid) {
+		$auth = $this->credentialsManager->retrieve($uid, self::CREDENTIALS_IDENTIFIER);
+		if (!is_array($auth)) {
+			return [
+				'user' => '',
+				'password' => ''
+			];
+		} else {
+			return $auth;
+		}
+	}
+
+	public function saveAuth($uid, $user, $password) {
+		$this->credentialsManager->store($uid, self::CREDENTIALS_IDENTIFIER, [
+			'user' => $user,
+			'password' => $password
+		]);
+	}
+
+	public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
+		if ($storage->getType() === StorageConfig::MOUNT_TYPE_ADMIN) {
+			$uid = '';
+		} elseif (is_null($user)) {
+			throw new InsufficientDataForMeaningfulAnswerException('No credentials saved');
+		} else {
+			$uid = $user->getUID();
+		}
+		$credentials = $this->credentialsManager->retrieve($uid, self::CREDENTIALS_IDENTIFIER);
+
+		if (is_array($credentials)) {
+			$storage->setBackendOption('user', $credentials['user']);
+			$storage->setBackendOption('password', $credentials['password']);
+		}
+	}
+
+}
diff --git a/apps/files_external/lib/Lib/Auth/Password/LoginCredentials.php b/apps/files_external/lib/Lib/Auth/Password/LoginCredentials.php
new file mode 100644
index 00000000000..25bd66fb41a
--- /dev/null
+++ b/apps/files_external/lib/Lib/Auth/Password/LoginCredentials.php
@@ -0,0 +1,92 @@
+<?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\Password;
+
+use \OCP\IL10N;
+use \OCP\IUser;
+use \OCA\Files_External\Lib\DefinitionParameter;
+use \OCA\Files_External\Lib\Auth\AuthMechanism;
+use \OCA\Files_External\Lib\StorageConfig;
+use \OCP\ISession;
+use \OCP\Security\ICredentialsManager;
+use \OCP\Files\Storage;
+use \OCA\Files_External\Lib\SessionStorageWrapper;
+use \OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException;
+
+/**
+ * Username and password from login credentials, saved in DB
+ */
+class LoginCredentials extends AuthMechanism {
+
+	const CREDENTIALS_IDENTIFIER = 'password::logincredentials/credentials';
+
+	/** @var ISession */
+	protected $session;
+
+	/** @var ICredentialsManager */
+	protected $credentialsManager;
+
+	public function __construct(IL10N $l, ISession $session, ICredentialsManager $credentialsManager) {
+		$this->session = $session;
+		$this->credentialsManager = $credentialsManager;
+
+		$this
+			->setIdentifier('password::logincredentials')
+			->setScheme(self::SCHEME_PASSWORD)
+			->setText($l->t('Log-in credentials, save in database'))
+			->addParameters([
+			])
+		;
+
+		\OCP\Util::connectHook('OC_User', 'post_login', $this, 'authenticate');
+	}
+
+	/**
+	 * Hook listener on post login
+	 *
+	 * @param array $params
+	 */
+	public function authenticate(array $params) {
+		$userId = $params['uid'];
+		$credentials = [
+			'user' => $this->session->get('loginname'),
+			'password' => $params['password']
+		];
+		$this->credentialsManager->store($userId, self::CREDENTIALS_IDENTIFIER, $credentials);
+	}
+
+	public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
+		if (!isset($user)) {
+			throw new InsufficientDataForMeaningfulAnswerException('No login credentials saved');
+		}
+		$uid = $user->getUID();
+		$credentials = $this->credentialsManager->retrieve($uid, self::CREDENTIALS_IDENTIFIER);
+
+		if (!isset($credentials)) {
+			throw new InsufficientDataForMeaningfulAnswerException('No login credentials saved');
+		}
+
+		$storage->setBackendOption('user', $credentials['user']);
+		$storage->setBackendOption('password', $credentials['password']);
+	}
+
+}
diff --git a/apps/files_external/lib/Lib/Auth/Password/UserProvided.php b/apps/files_external/lib/Lib/Auth/Password/UserProvided.php
new file mode 100644
index 00000000000..2f277163184
--- /dev/null
+++ b/apps/files_external/lib/Lib/Auth/Password/UserProvided.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * @author Robin Appelman <icewind@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_External\Lib\Auth\Password;
+
+use OCA\Files_External\Lib\Auth\IUserProvided;
+use OCA\Files_External\Lib\DefinitionParameter;
+use OCA\Files_External\Service\BackendService;
+use OCP\IL10N;
+use OCP\IUser;
+use OCA\Files_External\Lib\Auth\AuthMechanism;
+use OCA\Files_External\Lib\StorageConfig;
+use OCP\Security\ICredentialsManager;
+use OCP\Files\Storage;
+use OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException;
+
+/**
+ * User provided Username and Password
+ */
+class UserProvided extends AuthMechanism implements IUserProvided {
+
+	const CREDENTIALS_IDENTIFIER_PREFIX = 'password::userprovided/';
+
+	/** @var ICredentialsManager */
+	protected $credentialsManager;
+
+	public function __construct(IL10N $l, ICredentialsManager $credentialsManager) {
+		$this->credentialsManager = $credentialsManager;
+
+		$this
+			->setIdentifier('password::userprovided')
+			->setVisibility(BackendService::VISIBILITY_ADMIN)
+			->setScheme(self::SCHEME_PASSWORD)
+			->setText($l->t('User entered, store in database'))
+			->addParameters([
+				(new DefinitionParameter('user', $l->t('Username')))
+					->setFlag(DefinitionParameter::FLAG_USER_PROVIDED),
+				(new DefinitionParameter('password', $l->t('Password')))
+					->setType(DefinitionParameter::VALUE_PASSWORD)
+					->setFlag(DefinitionParameter::FLAG_USER_PROVIDED),
+			]);
+	}
+
+	private function getCredentialsIdentifier($storageId) {
+		return self::CREDENTIALS_IDENTIFIER_PREFIX . $storageId;
+	}
+
+	public function saveBackendOptions(IUser $user, $id, array $options) {
+		$this->credentialsManager->store($user->getUID(), $this->getCredentialsIdentifier($id), [
+			'user' => $options['user'], // explicitly copy the fields we want instead of just passing the entire $options array
+			'password' => $options['password'] // this way we prevent users from being able to modify any other field
+		]);
+	}
+
+	public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
+		if (!isset($user)) {
+			throw new InsufficientDataForMeaningfulAnswerException('No credentials saved');
+		}
+		$uid = $user->getUID();
+		$credentials = $this->credentialsManager->retrieve($uid, $this->getCredentialsIdentifier($storage->getId()));
+
+		if (!isset($credentials)) {
+			throw new InsufficientDataForMeaningfulAnswerException('No credentials saved');
+		}
+
+		$storage->setBackendOption('user', $credentials['user']);
+		$storage->setBackendOption('password', $credentials['password']);
+	}
+
+}
diff --git a/apps/files_external/personal.php b/apps/files_external/personal.php
index 195b826a4c2..8c289f8e30f 100644
--- a/apps/files_external/personal.php
+++ b/apps/files_external/personal.php
@@ -30,6 +30,7 @@ use \OCA\Files_External\Service\BackendService;
 $appContainer = \OC_Mount_Config::$app->getContainer();
 $backendService = $appContainer->query('OCA\Files_External\Service\BackendService');
 $userStoragesService = $appContainer->query('OCA\Files_External\Service\UserStoragesService');
+$globalAuth = $appContainer->query('OCA\Files_External\Lib\Auth\Password\GlobalAuth');
 
 $tmpl = new OCP\Template('files_external', 'settings');
 $tmpl->assign('encryptionEnabled', \OC::$server->getEncryptionManager()->isEnabled());
@@ -38,5 +39,8 @@ $tmpl->assign('storages', $userStoragesService->getStorages());
 $tmpl->assign('dependencies', OC_Mount_Config::dependencyMessage($backendService->getBackends()));
 $tmpl->assign('backends', $backendService->getAvailableBackends());
 $tmpl->assign('authMechanisms', $backendService->getAuthMechanisms());
+$uid = \OC::$server->getUserSession()->getUser()->getUID();
+$tmpl->assign('globalCredentials', $globalAuth->getAuth($uid));
+$tmpl->assign('globalCredentialsUid', $uid);
 $tmpl->assign('allowUserMounting', $backendService->isUserMountingAllowed());
 return $tmpl->fetchPage();
diff --git a/apps/files_external/settings.php b/apps/files_external/settings.php
index dda715d7f3e..24cd9cd9aeb 100644
--- a/apps/files_external/settings.php
+++ b/apps/files_external/settings.php
@@ -26,12 +26,11 @@
 
 use \OCA\Files_External\Service\BackendService;
 
-\OCP\User::checkAdminUser();
-
 // we must use the same container
 $appContainer = \OC_Mount_Config::$app->getContainer();
 $backendService = $appContainer->query('OCA\Files_External\Service\BackendService');
 $globalStoragesService = $appContainer->query('OCA\Files_External\Service\GlobalStoragesService');
+$globalAuth = $appContainer->query('OCA\Files_External\Lib\Auth\Password\GlobalAuth');
 
 \OC_Util::addVendorScript('select2/select2');
 \OC_Util::addVendorStyle('select2/select2');
@@ -44,4 +43,6 @@ $tmpl->assign('backends', $backendService->getAvailableBackends());
 $tmpl->assign('authMechanisms', $backendService->getAuthMechanisms());
 $tmpl->assign('dependencies', OC_Mount_Config::dependencyMessage($backendService->getBackends()));
 $tmpl->assign('allowUserMounting', $backendService->isUserMountingAllowed());
+$tmpl->assign('globalCredentials', $globalAuth->getAuth(''));
+$tmpl->assign('globalCredentialsUid', '');
 return $tmpl->fetchPage();
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 6662f637039..6fb2a018547 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -84,8 +84,24 @@
 		}
 	}
 ?>
-<form id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled']?'true': 'false'; ?>">
+<form autocomplete="false" class="section" action="#"
+	  id="global_credentials">
 	<h2><?php p($l->t('External Storage')); ?></h2>
+	<p><?php p($l->t('Global Credentials')); ?></p>
+	<input type="text" name="username"
+		autocomplete="false"
+		value="<?php p($_['globalCredentials']['user']); ?>"
+		placeholder="<?php p($l->t('Username')) ?>"/>
+	<input type="password" name="password"
+		autocomplete="false"
+		value="<?php p($_['globalCredentials']['password']); ?>"
+		placeholder="<?php p($l->t('Password')) ?>"/>
+	<input type="hidden" name="uid"
+		value="<?php p($_['globalCredentialsUid']); ?>"/>
+		<input type="submit" value="<?php p($l->t('Save')) ?>"/>
+</form>
+
+<form id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled']?'true': 'false'; ?>">
 	<?php if (isset($_['dependencies']) and ($_['dependencies']<>'')) print_unescaped(''.$_['dependencies'].''); ?>
 	<table id="externalStorage" class="grid" data-admin='<?php print_unescaped(json_encode($_['visibilityType'] === BackendService::VISIBILITY_ADMIN)); ?>'>
 		<thead>
diff --git a/apps/files_external/tests/Auth/Password/GlobalAuth.php b/apps/files_external/tests/Auth/Password/GlobalAuth.php
new file mode 100644
index 00000000000..912bfd1574d
--- /dev/null
+++ b/apps/files_external/tests/Auth/Password/GlobalAuth.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * @author Robin Appelman <icewind@owncloud.com>
+ *
+ * @copyright Copyright (c) 2016, 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\Tests\Auth\Password;
+
+use OCA\Files_External\Lib\Auth\Password\GlobalAuth;
+use OCA\Files_external\Lib\StorageConfig;
+use Test\TestCase;
+
+class GlobalAuthTest extends TestCase {
+	/**
+	 * @var \OCP\IL10N|\PHPUnit_Framework_MockObject_MockObject
+	 */
+	private $l10n;
+
+	/**
+	 * @var \OCP\Security\ICredentialsManager|\PHPUnit_Framework_MockObject_MockObject
+	 */
+	private $credentialsManager;
+
+	/**
+	 * @var GlobalAuth
+	 */
+	private $instance;
+
+	protected function setUp() {
+		parent::setUp();
+		$this->l10n = $this->getMock('\OCP\IL10N');
+		$this->credentialsManager = $this->getMock('\OCP\Security\ICredentialsManager');
+		$this->instance = new GlobalAuth($this->l10n, $this->credentialsManager);
+	}
+
+	private function getStorageConfig($type, $config = []) {
+		/** @var \OCA\Files_External\Lib\StorageConfig|\PHPUnit_Framework_MockObject_MockObject $storageConfig */
+		$storageConfig = $this->getMock('\OCA\Files_External\Lib\StorageConfig');
+		$storageConfig->expects($this->any())
+			->method('getType')
+			->will($this->returnValue($type));
+		$storageConfig->expects($this->any())
+			->method('getBackendOptions')
+			->will($this->returnCallback(function () use (&$config) {
+				return $config;
+			}));
+		$storageConfig->expects($this->any())
+			->method('getBackendOption')
+			->will($this->returnCallback(function ($key) use (&$config) {
+				return $config[$key];
+			}));
+		$storageConfig->expects($this->any())
+			->method('setBackendOption')
+			->will($this->returnCallback(function ($key, $value) use (&$config) {
+				$config[$key] = $value;
+			}));
+
+		return $storageConfig;
+	}
+
+	public function testNoCredentials() {
+		$this->credentialsManager->expects($this->once())
+			->method('retrieve')
+			->will($this->returnValue(null));
+
+		$storage = $this->getStorageConfig(StorageConfig::MOUNT_TYPE_ADMIN);
+
+		$this->instance->manipulateStorageConfig($storage);
+		$this->assertEquals([], $storage->getBackendOptions());
+	}
+
+	public function testSavedCredentials() {
+		$this->credentialsManager->expects($this->once())
+			->method('retrieve')
+			->will($this->returnValue([
+				'user' => 'a',
+				'password' => 'b'
+			]));
+
+		$storage = $this->getStorageConfig(StorageConfig::MOUNT_TYPE_ADMIN);
+
+		$this->instance->manipulateStorageConfig($storage);
+		$this->assertEquals([
+			'user' => 'a',
+			'password' => 'b'
+		], $storage->getBackendOptions());
+	}
+
+	/**
+	 * @expectedException \OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException
+	 */
+	public function testNoCredentialsPersonal() {
+		$this->credentialsManager->expects($this->never())
+			->method('retrieve');
+
+		$storage = $this->getStorageConfig(StorageConfig::MOUNT_TYPE_PERSONAl);
+
+		$this->instance->manipulateStorageConfig($storage);
+		$this->assertEquals([], $storage->getBackendOptions());
+	}
+
+}
diff --git a/apps/files_external/tests/Controller/AjaxControllerTest.php b/apps/files_external/tests/Controller/AjaxControllerTest.php
new file mode 100644
index 00000000000..c51172f8995
--- /dev/null
+++ b/apps/files_external/tests/Controller/AjaxControllerTest.php
@@ -0,0 +1,177 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace OCA\Files_External\Tests\Controller;
+
+use OCA\Files_External\Controller\AjaxController;
+use OCA\Files_External\Lib\Auth\Password\GlobalAuth;
+use OCA\Files_External\Lib\Auth\PublicKey\RSA;
+use OCP\AppFramework\Http\JSONResponse;
+use OCP\IGroupManager;
+use OCP\IRequest;
+use OCP\IUserSession;
+use Test\TestCase;
+
+class AjaxControllerTest extends TestCase {
+	/** @var IRequest */
+	private $request;
+	/** @var RSA */
+	private $rsa;
+	/** @var GlobalAuth */
+	private $globalAuth;
+	/** @var IUserSession */
+	private $userSession;
+	/** @var IGroupManager */
+	private $groupManager;
+	/** @var AjaxController */
+	private $ajaxController;
+
+	public function setUp() {
+		$this->request = $this->getMock('\\OCP\\IRequest');
+		$this->rsa = $this->getMockBuilder('\\OCA\\Files_External\\Lib\\Auth\\PublicKey\\RSA')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->globalAuth = $this->getMockBuilder('\\OCA\\Files_External\\Lib\\Auth\\Password\GlobalAuth')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->userSession = $this->getMock('\\OCP\\IUserSession');
+		$this->groupManager = $this->getMock('\\OCP\\IGroupManager');
+
+		$this->ajaxController = new AjaxController(
+			'files_external',
+			$this->request,
+			$this->rsa,
+			$this->globalAuth,
+			$this->userSession,
+			$this->groupManager
+		);
+
+		parent::setUp();
+	}
+
+	public function testGetSshKeys() {
+		$this->rsa
+			->expects($this->once())
+			->method('createKey')
+			->willReturn([
+				'privatekey' => 'MyPrivateKey',
+				'publickey' => 'MyPublicKey',
+			]);
+
+		$expected =  new JSONResponse(
+			[
+				'data' => [
+					'private_key' => 'MyPrivateKey',
+					'public_key' => 'MyPublicKey',
+				],
+				'status' => 'success',
+			]
+		);
+		$this->assertEquals($expected, $this->ajaxController->getSshKeys());
+	}
+
+	public function testSaveGlobalCredentialsAsAdminForAnotherUser() {
+		$user = $this->getMock('\\OCP\\IUser');
+		$user
+			->expects($this->once())
+			->method('getUID')
+			->willReturn('MyAdminUid');
+		$this->userSession
+			->expects($this->once())
+			->method('getUser')
+			->willReturn($user);
+		$this->groupManager
+			->expects($this->once())
+			->method('isAdmin')
+			->with('MyAdminUid')
+			->willReturn(true);
+		$this->globalAuth
+			->expects($this->once())
+			->method('saveAuth')
+			->with('UidOfTestUser', 'test', 'password');
+
+		$this->assertSame(true, $this->ajaxController->saveGlobalCredentials('UidOfTestUser', 'test', 'password'));
+	}
+
+	public function testSaveGlobalCredentialsAsAdminForSelf() {
+		$user = $this->getMock('\\OCP\\IUser');
+		$user
+			->expects($this->once())
+			->method('getUID')
+			->willReturn('MyAdminUid');
+		$this->userSession
+			->expects($this->once())
+			->method('getUser')
+			->willReturn($user);
+		$this->groupManager
+			->expects($this->once())
+			->method('isAdmin')
+			->with('MyAdminUid')
+			->willReturn(true);
+		$this->globalAuth
+			->expects($this->once())
+			->method('saveAuth')
+			->with('MyAdminUid', 'test', 'password');
+
+		$this->assertSame(true, $this->ajaxController->saveGlobalCredentials('MyAdminUid', 'test', 'password'));
+	}
+
+	public function testSaveGlobalCredentialsAsNormalUserForSelf() {
+		$user = $this->getMock('\\OCP\\IUser');
+		$user
+			->expects($this->exactly(2))
+			->method('getUID')
+			->willReturn('MyUserUid');
+		$this->userSession
+			->expects($this->once())
+			->method('getUser')
+			->willReturn($user);
+		$this->groupManager
+			->expects($this->once())
+			->method('isAdmin')
+			->with('MyUserUid')
+			->willReturn(false);
+		$this->globalAuth
+			->expects($this->once())
+			->method('saveAuth')
+			->with('MyUserUid', 'test', 'password');
+
+		$this->assertSame(true, $this->ajaxController->saveGlobalCredentials('MyUserUid', 'test', 'password'));
+	}
+
+	public function testSaveGlobalCredentialsAsNormalUserForAnotherUser() {
+		$user = $this->getMock('\\OCP\\IUser');
+		$user
+			->expects($this->exactly(2))
+			->method('getUID')
+			->willReturn('MyUserUid');
+		$this->userSession
+			->expects($this->once())
+			->method('getUser')
+			->willReturn($user);
+		$this->groupManager
+			->expects($this->once())
+			->method('isAdmin')
+			->with('MyUserUid')
+			->willReturn(false);
+
+		$this->assertSame(false, $this->ajaxController->saveGlobalCredentials('AnotherUserUid', 'test', 'password'));
+	}
+}