Merge branch 'master' into ext-fs-irods-master

51 files changed, 368 insertions, 183 deletions

diff --git a/apps/files/ajax/scan.php b/apps/files/ajax/scan.php
index 6659cd459c8..0706d4e7829 100644
--- a/apps/files/ajax/scan.php
+++ b/apps/files/ajax/scan.php
@@ -4,6 +4,16 @@ session_write_close();
 
 $force = (isset($_GET['force']) and ($_GET['force'] === 'true'));
 $dir = isset($_GET['dir']) ? $_GET['dir'] : '';
+if (isset($_GET['users'])) {
+	OC_JSON::checkAdminUser();
+	if ($_GET['users'] === 'all') {
+		$users = OC_User::getUsers();
+	} else {
+		$users = json_decode($_GET['users']);
+	}
+} else {
+	$users = array(OC_User::getUser());
+}
 
 $eventSource = new OC_EventSource();
 ScanListener::$eventSource = $eventSource;
@@ -12,21 +22,27 @@ ScanListener::$view = \OC\Files\Filesystem::getView();
 OC_Hook::connect('\OC\Files\Cache\Scanner', 'scan_folder', 'ScanListener', 'folder');
 OC_Hook::connect('\OC\Files\Cache\Scanner', 'scan_file', 'ScanListener', 'file');
 
-$absolutePath = \OC\Files\Filesystem::getView()->getAbsolutePath($dir);
+foreach ($users as $user) {
+	$eventSource->send('user', $user);
+	OC_Util::tearDownFS();
+	OC_Util::setupFS($user);
+
+	$absolutePath = \OC\Files\Filesystem::getView()->getAbsolutePath($dir);
 
-$mountPoints = \OC\Files\Filesystem::getMountPoints($absolutePath);
-$mountPoints[] = \OC\Files\Filesystem::getMountPoint($absolutePath);
-$mountPoints = array_reverse($mountPoints); //start with the mount point of $dir
+	$mountPoints = \OC\Files\Filesystem::getMountPoints($absolutePath);
+	$mountPoints[] = \OC\Files\Filesystem::getMountPoint($absolutePath);
+	$mountPoints = array_reverse($mountPoints); //start with the mount point of $dir
 
-foreach ($mountPoints as $mountPoint) {
-	$storage = \OC\Files\Filesystem::getStorage($mountPoint);
-	if ($storage) {
-		ScanListener::$mountPoints[$storage->getId()] = $mountPoint;
-		$scanner = $storage->getScanner();
-		if ($force) {
-			$scanner->scan('', \OC\Files\Cache\Scanner::SCAN_RECURSIVE, \OC\Files\Cache\Scanner::REUSE_ETAG);
-		} else {
-			$scanner->backgroundScan();
+	foreach ($mountPoints as $mountPoint) {
+		$storage = \OC\Files\Filesystem::getStorage($mountPoint);
+		if ($storage) {
+			ScanListener::$mountPoints[$storage->getId()] = $mountPoint;
+			$scanner = $storage->getScanner();
+			if ($force) {
+				$scanner->scan('', \OC\Files\Cache\Scanner::SCAN_RECURSIVE, \OC\Files\Cache\Scanner::REUSE_ETAG);
+			} else {
+				$scanner->backgroundScan();
+			}
 		}
 	}
 }
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index a79d34c9b23..3438c1c30a1 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -695,7 +695,7 @@ $(document).ready(function() {
 	}
 });
 
-function scanFiles(force, dir){
+function scanFiles(force, dir, users){
 	if (!OC.currentUser) {
 		return;
 	}
@@ -705,7 +705,18 @@ function scanFiles(force, dir){
 	}
 	force = !!force; //cast to bool
 	scanFiles.scanning = true;
-	var scannerEventSource = new OC.EventSource(OC.filePath('files','ajax','scan.php'),{force:force,dir:dir});
+	var scannerEventSource;
+	if (users) {
+		var usersString;
+		if (users === 'all') {
+			usersString = users;
+		} else {
+			usersString = JSON.stringify(users);
+		}
+		scannerEventSource = new OC.EventSource(OC.filePath('files','ajax','scan.php'),{force: force,dir: dir, users: usersString});
+	} else {
+		scannerEventSource = new OC.EventSource(OC.filePath('files','ajax','scan.php'),{force: force,dir: dir});
+	}
 	scanFiles.cancel = scannerEventSource.close.bind(scannerEventSource);
 	scannerEventSource.listen('count',function(count){
 		console.log(count + ' files scanned')
@@ -717,6 +728,9 @@ function scanFiles(force, dir){
 		scanFiles.scanning=false;
 		console.log('done after ' + count + ' files');
 	});
+	scannerEventSource.listen('user',function(user){
+		console.log('scanning files for ' + user);
+	});
 }
 scanFiles.scanning=false;
 
diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php
index 3eeb88754c7..d4cc7b2bb94 100644
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@@ -9,9 +9,11 @@
 "No file was uploaded" => "Neniu dosiero alŝutiĝis.",
 "Missing a temporary folder" => "Mankas provizora dosierujo.",
 "Failed to write to disk" => "Malsukcesis skribo al disko",
+"Not enough storage available" => "Ne haveblas sufiĉa memoro",
 "Invalid directory." => "Nevalida dosierujo.",
 "Files" => "Dosieroj",
 "Share" => "Kunhavigi",
+"Delete permanently" => "Forigi por ĉiam",
 "Delete" => "Forigi",
 "Rename" => "Alinomigi",
 "Pending" => "Traktotaj",
@@ -21,11 +23,14 @@
 "cancel" => "nuligi",
 "replaced {new_name} with {old_name}" => "anstataŭiĝis {new_name} per {old_name}",
 "undo" => "malfari",
+"perform delete operation" => "plenumi forigan operacion",
 "1 file uploading" => "1 dosiero estas alŝutata",
 "files uploading" => "dosieroj estas alŝutataj",
 "'.' is an invalid file name." => "'.' ne estas valida dosiernomo.",
 "File name cannot be empty." => "Dosiernomo devas ne malpleni.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nevalida nomo: “\\”, “/”, “<”, “>”, “:”, “\"”, “|”, “?” kaj “*” ne permesatas.",
+"Your storage is full, files can not be updated or synced anymore!" => "Via memoro plenas, ne plu eblas ĝisdatigi aŭ sinkronigi dosierojn!",
+"Your storage is almost full ({usedSpacePercent}%)" => "Via memoro preskaŭ plenas ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Via elŝuto pretiĝatas. Ĉi tio povas daŭri iom da tempo se la dosieroj grandas.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Ne eblis alŝuti vian dosieron ĉar ĝi estas dosierujo aŭ havas 0 duumokojn",
 "Not enough space available" => "Ne haveblas sufiĉa spaco",
@@ -41,6 +46,7 @@
 "{count} folders" => "{count} dosierujoj",
 "1 file" => "1 dosiero",
 "{count} files" => "{count} dosierujoj",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nevalida dosierujnomo. La uzo de “Shared” estas rezervita de ownCloud.",
 "Unable to rename file" => "Ne eblis alinomigi dosieron",
 "Upload" => "Alŝuti",
 "File handling" => "Dosieradministro",
@@ -55,12 +61,15 @@
 "Text file" => "Tekstodosiero",
 "Folder" => "Dosierujo",
 "From link" => "El ligilo",
+"Deleted files" => "Forigitaj dosieroj",
 "Cancel upload" => "Nuligi alŝuton",
+"You don’t have write permissions here." => "Vi ne havas permeson skribi ĉi tie.",
 "Nothing in here. Upload something!" => "Nenio estas ĉi tie. Alŝutu ion!",
 "Download" => "Elŝuti",
 "Unshare" => "Malkunhavigi",
 "Upload too large" => "Alŝuto tro larĝa",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "La dosieroj, kiujn vi provas alŝuti, transpasas la maksimuman grandon por dosieralŝutoj en ĉi tiu servilo.",
 "Files are being scanned, please wait." => "Dosieroj estas skanataj, bonvolu atendi.",
-"Current scanning" => "Nuna skano"
+"Current scanning" => "Nuna skano",
+"Upgrading filesystem cache..." => "Ĝisdatiĝas dosiersistema kaŝmemoro..."
 );
diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php
index 8fdf62aeb32..59c12c57a38 100644
--- a/apps/files/l10n/ro.php
+++ b/apps/files/l10n/ro.php
@@ -46,6 +46,7 @@
 "{count} folders" => "{count} foldare",
 "1 file" => "1 fisier",
 "{count} files" => "{count} fisiere",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nume de dosar invalid. Utilizarea 'Shared' e rezervată de ownCloud",
 "Unable to rename file" => "Nu s-a putut redenumi fișierul",
 "Upload" => "Încărcare",
 "File handling" => "Manipulare fișiere",
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index 6902d311ab7..ed6391a588e 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -46,6 +46,7 @@
 "{count} folders" => "{count} map",
 "1 file" => "1 datoteka",
 "{count} files" => "{count} datotek",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ime mape je neveljavno. Uporaba oznake \"Souporaba\" je rezervirana za ownCloud",
 "Unable to rename file" => "Ni mogoče preimenovati datoteke",
 "Upload" => "Pošlji",
 "File handling" => "Upravljanje z datotekami",
diff --git a/apps/files/triggerupdate.php b/apps/files/triggerupdate.php
new file mode 100644
index 00000000000..0e29edbba35
--- /dev/null
+++ b/apps/files/triggerupdate.php
@@ -0,0 +1,22 @@
+<?php
+
+require_once __DIR__ . '/../../lib/base.php';
+
+if (OC::$CLI) {
+	if (count($argv) === 2) {
+		$file = $argv[1];
+		list(, $user) = explode('/', $file);
+		OC_Util::setupFS($user);
+		$view = new \OC\Files\View('');
+		/**
+		 * @var \OC\Files\Storage\Storage $storage
+		 */
+		list($storage, $internalPath) = $view->resolvePath($file);
+		$watcher = $storage->getWatcher($internalPath);
+		$watcher->checkUpdate($internalPath);
+	} else {
+		echo "Usage: php triggerupdate.php /path/to/file\n";
+	}
+} else {
+	echo "This script can be run from the command line only\n";
+}
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index 419bef1edef..d97811bb791 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -33,13 +33,18 @@ if (!OC_Config::getValue('maintenance', false)) {
 		}
 
 		$view = new OC_FilesystemView('/');
-		$session = new \OCA\Encryption\Session($view);
+
+		$sessionReady = false;
+		if(extension_loaded("openssl")) {
+			$session = new \OCA\Encryption\Session($view);
+			$sessionReady = true;
+		}
 
 		$user = \OCP\USER::getUser();
 		// check if user has a private key
-		if (
-			!$view->file_exists('/' . $user . '/files_encryption/' . $user . '.private.key')
-			&& OCA\Encryption\Crypt::mode() === 'server'
+		if ($sessionReady === false
+			|| (!$view->file_exists('/' . $user . '/files_encryption/' . $user . '.private.key')
+				&& OCA\Encryption\Crypt::mode() === 'server')
 		) {
 
 			// Force the user to log-in again if the encryption key isn't unlocked
diff --git a/apps/files_encryption/appinfo/info.xml b/apps/files_encryption/appinfo/info.xml
index ea8f6cf6f31..1e97b1b2217 100644
--- a/apps/files_encryption/appinfo/info.xml
+++ b/apps/files_encryption/appinfo/info.xml
@@ -2,7 +2,7 @@
 <info>
 	<id>files_encryption</id>
 	<name>Encryption</name>
-	<description>WARNING: This is a preview release of the new ownCloud 5 encryption system. Testing and feedback is very welcome but don't use this in production yet. Encryption is not yet compatible with LDAP.</description>
+	<description>WARNING: This is a preview release of the new ownCloud 5 encryption system. Testing and feedback is very welcome but don't use this in production yet. After the app was enabled you need to re-login to initialize your encryption keys</description>
 	<licence>AGPL</licence>
 	<author>Sam Tuke, Bjoern Schiessle, Florin Peter</author>
 	<require>4</require>
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 7698b95cfd3..e39e068cc5d 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -38,11 +38,15 @@ class Hooks {
 	 * @note This method should never be called for users using client side encryption

 	 */

 	public static function login($params) {

-

-		// Manually initialise Filesystem{} singleton with correct 

-		// fake root path, in order to avoid fatal webdav errors

-		// NOTE: disabled because this give errors on webdav!

-		//\OC\Files\Filesystem::init( $params['uid'], '/' . 'files' . '/' );

+		$l = new \OC_L10N('files_encryption');

+		//check if openssl is available

+		if(!extension_loaded("openssl") ) {

+			$error_msg = $l->t("PHP module OpenSSL is not installed.");

+			$hint = $l->t('Please ask your server administrator to install the module. For now the encryption app was disabled.');

+			\OC_App::disable('files_encryption');

+			\OCP\Util::writeLog('Encryption library', $error_msg . ' ' . $hint, \OCP\Util::ERROR);

+			\OCP\Template::printErrorPage($error_msg, $hint);

+		}

 

 		$view = new \OC_FilesystemView('/');

 

diff --git a/apps/files_encryption/l10n/ca.php b/apps/files_encryption/l10n/ca.php
index 17a073c1c69..44836fb9c96 100644
--- a/apps/files_encryption/l10n/ca.php
+++ b/apps/files_encryption/l10n/ca.php
@@ -13,13 +13,8 @@
 "You can unlock your private key in your " => "Podeu desbloquejar la clau privada en el vostre",
 "personal settings" => "arranjament personal",
 "Encryption" => "Xifrat",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Activa la clau de recuperació de contrasenya (permet compartir la clau de recuperació):",
-"Recovery account password" => "Contrasenya de recuperació del compte",
 "Enabled" => "Activat",
 "Disabled" => "Desactivat",
-"Change encryption passwords recovery key:" => "Canvia la clau de recuperació de la contrasenya:",
-"Old Recovery account password" => "Contrasenya de recuperació anterior",
-"New Recovery account password" => "Nova contrasenya de recuperació de compte",
 "Change Password" => "Canvia la contrasenya",
 "Your private key password no longer match your log-in password:" => "La clau privada ja no es correspon amb la contrasenya d'accés:",
 "Set your old private key password to your current log-in password." => "Establiu la vostra contrasenya clau en funció de la contrasenya actual d'accés.",
diff --git a/apps/files_encryption/l10n/cs_CZ.php b/apps/files_encryption/l10n/cs_CZ.php
index a005141ce0c..88548b94306 100644
--- a/apps/files_encryption/l10n/cs_CZ.php
+++ b/apps/files_encryption/l10n/cs_CZ.php
@@ -10,13 +10,8 @@
 "Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files" => "Váš soukromý klíč není platný. Možná bylo vaše heslo změněno z venku. Můžete aktualizovat heslo soukromého klíče v osobním nastavení pro opětovné získání přístupu k souborům",
 "Saving..." => "Ukládám...",
 "Encryption" => "Šifrování",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Povolit záchranný klíč šifrovacích hesel (povolí sdílený záchranný klíč):",
-"Recovery account password" => "Heslo pro obnovu účtu",
 "Enabled" => "Povoleno",
 "Disabled" => "Zakázáno",
-"Change encryption passwords recovery key:" => "Změnit záchranný klíč šifrovacích hesel:",
-"Old Recovery account password" => "Stávající heslo pro obnovu účtu",
-"New Recovery account password" => "Nové heslo pro obnovu účtu",
 "Change Password" => "Změnit heslo",
 "Enable password recovery:" => "Povolit obnovu hesla:",
 "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Povolení vám umožní znovu získat přístup k vašim zašifrovaným souborům pokud ztratíte heslo",
diff --git a/apps/files_encryption/l10n/de.php b/apps/files_encryption/l10n/de.php
index 404834bd87b..ed9b8d6c16e 100644
--- a/apps/files_encryption/l10n/de.php
+++ b/apps/files_encryption/l10n/de.php
@@ -9,10 +9,8 @@
 "Saving..." => "Speichern...",
 "personal settings" => "Private Einstellungen",
 "Encryption" => "Verschlüsselung",
-"Recovery account password" => "Password zurücksetzen",
 "Enabled" => "Aktiviert",
 "Disabled" => "Deaktiviert",
-"Change encryption passwords recovery key:" => "Wiederherstellungsschlüssel für Passwörter ändern:",
 "Change Password" => "Passwort ändern",
 "Old log-in password" => "Altes login Passwort",
 "Current log-in password" => "Aktuelles Passwort",
diff --git a/apps/files_encryption/l10n/de_DE.php b/apps/files_encryption/l10n/de_DE.php
index b12bda42f84..59ccbaa1fc1 100644
--- a/apps/files_encryption/l10n/de_DE.php
+++ b/apps/files_encryption/l10n/de_DE.php
@@ -5,14 +5,22 @@
 "Could not disable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
 "Password successfully changed." => "Das Passwort wurde erfolgreich geändert.",
 "Could not change the password. Maybe the old password was not correct." => "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.",
+"Private key password successfully updated." => "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert.",
+"Could not update the private key password. Maybe the old password was not correct." => "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Vielleicht war das alte Passwort nicht richtig.",
+"PHP module OpenSSL is not installed." => "Das PHP-Modul OpenSSL ist nicht installiert.",
+"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Bitte fragen Sie Ihren Server-Administrator, das entsprechende Modul zu installieren. Bis dahin wurde die Anwendung zur Verschlüsselung deaktiviert.",
 "Saving..." => "Speichern...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "Ihr privater Schlüssel ist ungültig! Vielleicht wurde Ihr Passwort von außerhalb geändert.",
+"personal settings" => "Persönliche Einstellungen",
 "Encryption" => "Verschlüsselung",
-"Recovery account password" => "Account-Passwort wiederherstellen",
 "Enabled" => "Aktiviert",
 "Disabled" => "Deaktiviert",
-"Old Recovery account password" => "Altes Passwort für die Account-Wiederherstellung",
-"New Recovery account password" => "Neues Passwort für die Account-Wiederherstellung",
 "Change Password" => "Passwort ändern",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen.",
+"Old log-in password" => "Altes Login-Passwort",
+"Current log-in password" => "Momentanes Login-Passwort",
+"Update Private Key Password" => "Das Passwort des privaten Schlüssels aktualisieren",
+"Enable password recovery:" => "Passwort-Wiederherstellung aktivieren:",
 "File recovery settings updated" => "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert.",
 "Could not update file recovery" => "Die Dateiwiederherstellung konnte nicht aktualisiert werden."
 );
diff --git a/apps/files_encryption/l10n/el.php b/apps/files_encryption/l10n/el.php
index 7bf9be11a01..990f464bc1a 100644
--- a/apps/files_encryption/l10n/el.php
+++ b/apps/files_encryption/l10n/el.php
@@ -2,8 +2,8 @@
 "Password successfully changed." => "Ο κωδικός αλλάχτηκε επιτυχώς.",
 "Could not change the password. Maybe the old password was not correct." => "Αποτυχία αλλαγής κωδικού ίσως ο παλιός κωδικός να μην ήταν σωστός.",
 "Saving..." => "Γίνεται αποθήκευση...",
+"personal settings" => "προσωπικές ρυθμίσεις",
 "Encryption" => "Κρυπτογράφηση",
-"Recovery account password" => "Επαναφορά κωδικού πρόσβασης λογαριασμού",
 "Enabled" => "Ενεργοποιημένο",
 "Disabled" => "Απενεργοποιημένο",
 "Change Password" => "Αλλαγή Κωδικού Πρόσβασης",
diff --git a/apps/files_encryption/l10n/eo.php b/apps/files_encryption/l10n/eo.php
index ea405fda1ab..f6e0e884f35 100644
--- a/apps/files_encryption/l10n/eo.php
+++ b/apps/files_encryption/l10n/eo.php
@@ -1,4 +1,16 @@
 <?php $TRANSLATIONS = array(
+"Password successfully changed." => "La pasvorto sukcese ŝanĝiĝis.",
+"Could not change the password. Maybe the old password was not correct." => "Ne eblis ŝanĝi la pasvorton. Eble la malnova pasvorto malĝustis.",
+"Private key password successfully updated." => "La pasvorto de la malpublika klavo sukcese ĝisdatiĝis.",
+"PHP module OpenSSL is not installed." => "La PHP-modulo OpenSSL ne instalitas.",
 "Saving..." => "Konservante...",
-"Encryption" => "Ĉifrado"
+"personal settings" => "persona agordo",
+"Encryption" => "Ĉifrado",
+"Enabled" => "Kapabligita",
+"Disabled" => "Malkapabligita",
+"Change Password" => "Ŝarĝi pasvorton",
+"Your private key password no longer match your log-in password:" => "La pasvorto de via malpublika klavo ne plu kongruas kun via ensaluta pasvorto:",
+"Old log-in password" => "Malnova ensaluta pasvorto",
+"Current log-in password" => "Nuna ensaluta pasvorto",
+"Update Private Key Password" => "Ĝisdatigi la pasvorton de la malpublika klavo"
 );
diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php
index 5ba3e36b1ac..a88eccc0e41 100644
--- a/apps/files_encryption/l10n/es.php
+++ b/apps/files_encryption/l10n/es.php
@@ -6,16 +6,31 @@
 "Password successfully changed." => "Su contraseña ha sido cambiada",
 "Could not change the password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.",
 "Private key password successfully updated." => "Contraseña de clave privada actualizada con éxito.",
+"Could not update the private key password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Puede que la contraseña antigua no sea correcta.",
+"Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files" => "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera. Puede actualizar la contraseña de su clave privada en sus opciones personales para recuperar el acceso a sus ficheros",
+"PHP module OpenSSL is not installed." => "El módulo OpenSSL de PHP no está instalado.",
+"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Por favor pida al administrador de su servidor que le instale el módulo. De momento la aplicación de cifrado está deshabilitada.",
 "Saving..." => "Guardando...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera.",
+"You can unlock your private key in your " => "Puede desbloquear su clave privada en su",
+"personal settings" => "opciones personales",
 "Encryption" => "Cifrado",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Habilitar clave de recuperación de contraseñas ():",
-"Recovery account password" => "Recuperar contraseña",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Habilitar la clave de recuperación (permite recuperar los ficheros del usuario en caso de pérdida de la contraseña);",
+"Recovery key password" => "Contraseña de clave de recuperación",
 "Enabled" => "Habilitar",
 "Disabled" => "Deshabilitado",
-"Change encryption passwords recovery key:" => "Cambiar clave de cifrado de contraseñas:",
-"Old Recovery account password" => "Contraseña de recuperación actual",
-"New Recovery account password" => "Contraseña de recuperación nueva",
+"Change recovery key password:" => "Cambiar la contraseña de la clave de recuperación",
+"Old Recovery key password" => "Contraseña de la antigua clave de recuperación",
+"New Recovery key password" => "Contraseña de la nueva clave de recuperación",
 "Change Password" => "Cambiar contraseña",
+"Your private key password no longer match your log-in password:" => "Su contraseña de clave privada ya no coincide con su contraseña de acceso:",
+"Set your old private key password to your current log-in password." => "Establecer la contraseña de su antigua clave privada a su contraseña actual de acceso.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Si no recuerda su antigua contraseña puede pedir a su administrador que le recupere sus ficheros.",
+"Old log-in password" => "Contraseña de acceso antigua",
+"Current log-in password" => "Contraseña de acceso actual",
+"Update Private Key Password" => "Actualizar Contraseña de Clave Privada",
+"Enable password recovery:" => "Habilitar la recuperación de contraseña:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Habilitar esta opción le permitirá volver a tener acceso a sus ficheros cifrados en caso de pérdida de contraseña",
 "File recovery settings updated" => "Opciones de recuperación de archivos actualizada",
 "Could not update file recovery" => "No se pudo actualizar la recuperación de archivos"
 );
diff --git a/apps/files_encryption/l10n/es_AR.php b/apps/files_encryption/l10n/es_AR.php
index 9d003a37515..e7f28e1e1f6 100644
--- a/apps/files_encryption/l10n/es_AR.php
+++ b/apps/files_encryption/l10n/es_AR.php
@@ -1,8 +1,36 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Se habilitó la recuperación de archivos",
+"Could not enable recovery key. Please check your recovery key password!" => "No se pudo habilitar la clave de recuperación. Por favor, comprobá tu contraseña.",
+"Recovery key successfully disabled" => "Clave de recuperación deshabilitada",
+"Could not disable recovery key. Please check your recovery key password!" => "No fue posible deshabilitar la clave de recuperación.  Por favor, comprobá tu contraseña.",
 "Password successfully changed." => "Tu contraseña fue cambiada",
 "Could not change the password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Comprobá que la contraseña actual sea correcta.",
+"Private key password successfully updated." => "Contraseña de clave privada actualizada con éxito.",
+"Could not update the private key password. Maybe the old password was not correct." => "No fue posible actualizar la contraseña de la clave privada. Tal vez la contraseña antigua no es correcta.",
+"Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files" => "¡Tu clave privada no es válida! Tal vez tu contraseña fue cambiada de alguna manera. Podés actualizar tu clave privada de contraseña en 'configuración personal' para tener acceso nuevamente a tus archivos",
+"PHP module OpenSSL is not installed." => "El módulo OpenSSL para PHP no está instalado.",
+"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Pedile al administrador del servidor que instale el módulo. Por ahora la App de encriptación está deshabilitada.",
 "Saving..." => "Guardando...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "¡Tu clave privada no es válida! Tal vez tu contraseña fue cambiada desde afuera.",
+"You can unlock your private key in your " => "Podés desbloquear tu clave privada en tu",
+"personal settings" => "Configuración personal",
 "Encryption" => "Encriptación",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Habilitar clave de recuperación de contraseñas (permite compartir clave de contraseñas):",
-"Recovery account password" => "Recuperar contraseña"
+"Enable recovery key (allow to recover users files in case of password loss):" => "Habilitar clave de recuperación (te permite recuperar los archivos de usuario en el caso en que pierdas la contraseña):",
+"Recovery key password" => "Contraseña de recuperación de clave",
+"Enabled" => "Habilitado",
+"Disabled" => "Deshabilitado",
+"Change recovery key password:" => "Cambiar contraseña para recuperar la clave:",
+"Old Recovery key password" => "Contraseña antigua de recuperación de clave",
+"New Recovery key password" => "Nueva contraseña de recuperación de clave",
+"Change Password" => "Cambiar contraseña",
+"Your private key password no longer match your log-in password:" => "Tu contraseña de recuperación de clave ya no coincide con la contraseña de ingreso:",
+"Set your old private key password to your current log-in password." => "Usá tu contraseña de recuperación de clave antigua para tu contraseña de ingreso actual.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Si no te acordás de tu contraseña antigua, pedile al administrador que recupere tus archivos",
+"Old log-in password" => "Contraseña anterior",
+"Current log-in password" => "Contraseña actual",
+"Update Private Key Password" => "Actualizar contraseña de la clave privada",
+"Enable password recovery:" => "Habilitar contraseña de recuperación:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Habilitando esta opción te va a permitir tener acceso a tus archivos encriptados incluso si perdés la contraseña",
+"File recovery settings updated" => "Las opciones de recuperación de archivos fueron actualizadas",
+"Could not update file recovery" => "No fue posible actualizar la recuperación de archivos"
 );
diff --git a/apps/files_encryption/l10n/et_EE.php b/apps/files_encryption/l10n/et_EE.php
index e24da6ac678..94c774636b0 100644
--- a/apps/files_encryption/l10n/et_EE.php
+++ b/apps/files_encryption/l10n/et_EE.php
@@ -7,13 +7,8 @@
 "Could not change the password. Maybe the old password was not correct." => "Ei suutnud vahetada parooli. Võib-olla on vana parool valesti sisestatud.",
 "Saving..." => "Salvestamine...",
 "Encryption" => "Krüpteerimine",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Luba krüpteerimise paroolide taastevõti (võimalda parooli jagamine taastevõtmesse):",
-"Recovery account password" => "Konto taasteparool",
 "Enabled" => "Sisse lülitatud",
 "Disabled" => "Väljalülitatud",
-"Change encryption passwords recovery key:" => "Muuda taaste võtme krüpteerimise paroole:",
-"Old Recovery account password" => "Konto vana taaste parool",
-"New Recovery account password" => "Konto uus taasteparool",
 "Change Password" => "Muuda parooli",
 "File recovery settings updated" => "Faili taaste seaded uuendatud",
 "Could not update file recovery" => "Ei suuda uuendada taastefaili"
diff --git a/apps/files_encryption/l10n/eu.php b/apps/files_encryption/l10n/eu.php
index 253953e5c52..5f6208bffd7 100644
--- a/apps/files_encryption/l10n/eu.php
+++ b/apps/files_encryption/l10n/eu.php
@@ -1,4 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Saving..." => "Gordetzen...",
-"Encryption" => "Enkriptazioa"
+"Encryption" => "Enkriptazioa",
+"Enabled" => "Gaitua",
+"Disabled" => "Ez-gaitua",
+"Change Password" => "Aldatu Pasahitza"
 );
diff --git a/apps/files_encryption/l10n/fr.php b/apps/files_encryption/l10n/fr.php
index 24bb81e8cfb..52a970d68bf 100644
--- a/apps/files_encryption/l10n/fr.php
+++ b/apps/files_encryption/l10n/fr.php
@@ -1,28 +1,36 @@
 <?php $TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Clé de récupération activée avec succès",
-"Could not enable recovery key. Please check your recovery key password!" => "Ne peut pas activer la clé de récupération. s'il vous plait vérifiez votre mot de passe de clé de récupération!",
-"Recovery key successfully disabled" => "Clé de récupération désactivée avc succès",
-"Could not disable recovery key. Please check your recovery key password!" => "Ne peut pas désactiver la clé de récupération. S'il vous plait vérifiez votre mot de passe de clé de récupération!",
+"Could not enable recovery key. Please check your recovery key password!" => "Impossible d'activer la clé de récupération. Veuillez vérifier votre mot de passe de clé de récupération !",
+"Recovery key successfully disabled" => "Clé de récupération désactivée avec succès",
+"Could not disable recovery key. Please check your recovery key password!" => "Impossible de désactiver la clé de récupération. Veuillez vérifier votre mot de passe de clé de récupération !",
 "Password successfully changed." => "Mot de passe changé avec succès ",
 "Could not change the password. Maybe the old password was not correct." => "Ne peut pas changer le mot de passe. L'ancien mot de passe est peut-être incorrect.",
 "Private key password successfully updated." => "Mot de passe de la clé privé mis à jour avec succès.",
 "Could not update the private key password. Maybe the old password was not correct." => "Impossible de mettre à jour le mot de passe de la clé privé. Peut-être que l'ancien mot de passe n'était pas correcte.",
+"Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files" => "Votre clef privée est invalide ! Votre mot de passe a peut-être été modifié depuis l'extérieur. Vous pouvez mettre à jour le mot de passe de votre clef privée dans vos paramètres personnels pour récupérer l'accès à vos fichiers",
+"PHP module OpenSSL is not installed." => "Le module OpenSSL de PHP n'est pas installé.",
+"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Veuillez demander à l'administrateur du serveur d'installer le module. Pour l'instant l'application de chiffrement a été désactivé.",
 "Saving..." => "Enregistrement...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "Votre clef privée est invalide ! Votre mot de passe a peut-être été modifié depuis l'extérieur.",
 "You can unlock your private key in your " => "Vous pouvez déverrouiller votre clé privée dans votre",
 "personal settings" => "paramètres personnel",
 "Encryption" => "Chiffrement",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Activer la clé de récupération par mots de passe de cryptage (autoriser le partage de la clé de récupération) ",
-"Recovery account password" => "Rétablissement du compte mot de passe ",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Activer la clef de récupération (permet de récupérer les fichiers des utilisateurs en cas de perte de mot de passe).",
+"Recovery key password" => "Mot de passe de la clef de récupération",
 "Enabled" => "Activer",
 "Disabled" => "Désactiver",
-"Change encryption passwords recovery key:" => "Changer les mots de passe de cryptage par la clé de récupération",
-"Old Recovery account password" => "Ancien compte de récupération de mots de passe",
-"New Recovery account password" => "Nouveau compte de récupération de mots de passe",
+"Change recovery key password:" => "Modifier le mot de passe de la clef de récupération :",
+"Old Recovery key password" => "Ancien mot de passe de la clef de récupération",
+"New Recovery key password" => "Nouveau mot de passe de la clef de récupération",
 "Change Password" => "Changer de mot de passe",
+"Your private key password no longer match your log-in password:" => "Le mot de passe de votre clef privée ne correspond plus à votre mot de passe de connexion :",
+"Set your old private key password to your current log-in password." => "Configurez le mot de passe de votre ancienne clef privée avec votre mot de passe courant de connexion. ",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Si vous ne vous souvenez plus de votre ancien mot de passe, vous pouvez demander à votre administrateur de récupérer vos fichiers.",
 "Old log-in password" => "Ancien mot de passe de connexion",
 "Current log-in password" => "Actuel mot de passe de connexion",
 "Update Private Key Password" => "Mettre à jour le mot de passe de votre clé privée",
-"Enable password recovery:" => "Activer la récupération du mot de passe:",
-"File recovery settings updated" => "Mise à jour des paramètres de récupération de fichiers ",
+"Enable password recovery:" => "Activer la récupération du mot de passe :",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Activer cette option vous permettra d'obtenir à nouveau l'accès à vos fichiers chiffrés en cas de perte de mot de passe",
+"File recovery settings updated" => "Paramètres de récupération de fichiers mis à jour",
 "Could not update file recovery" => "Ne peut pas remettre à jour les fichiers de récupération"
 );
diff --git a/apps/files_encryption/l10n/gl.php b/apps/files_encryption/l10n/gl.php
index 6fc6abccefe..e82840fa9a2 100644
--- a/apps/files_encryption/l10n/gl.php
+++ b/apps/files_encryption/l10n/gl.php
@@ -8,18 +8,20 @@
 "Private key password successfully updated." => "A chave privada foi actualizada correctamente.",
 "Could not update the private key password. Maybe the old password was not correct." => "Non foi posíbel actualizar o contrasinal da chave privada. É probábel que o contrasinal antigo non sexa correcto.",
 "Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files" => "A chave privada non é correcta! É probábel que o seu contrasinal teña sido cambiado desde o exterior. Vostede pode actualizar o contrasinal da súa chave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros",
+"PHP module OpenSSL is not installed." => "O módulo PHP OpenSSL non está instalado.",
+"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Pregúntelle ao administrador do servidor pola instalación do módulo. Polo de agora o aplicativo de cifrado foi desactivado.",
 "Saving..." => "Gardando...",
 "Your private key is not valid! Maybe the your password was changed from outside." => "A chave privada non é correcta! É probábel que o seu contrasinal teña sido cambiado desde o exterior. ",
 "You can unlock your private key in your " => "Pode desbloquear a chave privada nos seus",
 "personal settings" => "axustes persoais",
 "Encryption" => "Cifrado",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Activar a chave  de recuperación do cifrado de contrasinais (permite compartir a chave de recuperación):",
-"Recovery account password" => "Recuperación do contrasinal da conta",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Activar a chave de recuperación (permitirá recuperar os ficheiros dos usuarios no caso de perda do contrasinal):",
+"Recovery key password" => "Contrasinal da chave de recuperación",
 "Enabled" => "Activado",
 "Disabled" => "Desactivado",
-"Change encryption passwords recovery key:" => "Cambiar a chave de la recuperación do cifrado de contrasinais:",
-"Old Recovery account password" => "Antigo contrasinal de recuperación da conta",
-"New Recovery account password" => "Novo contrasinal de recuperación da conta",
+"Change recovery key password:" => "Cambiar o contrasinal da chave de la recuperación:",
+"Old Recovery key password" => "Antigo contrasinal da chave de recuperación",
+"New Recovery key password" => "Novo contrasinal da chave de recuperación",
 "Change Password" => "Cambiar o contrasinal",
 "Your private key password no longer match your log-in password:" => "O seu contrasinal da chave privada non coincide co seu contrasinal de acceso.",
 "Set your old private key password to your current log-in password." => "Estabeleza o seu contrasinal antigo da chave de recuperación ao seu contrasinal de acceso actual",
diff --git a/apps/files_encryption/l10n/it.php b/apps/files_encryption/l10n/it.php
index 3226a17ee99..f0f2c79cc4f 100644
--- a/apps/files_encryption/l10n/it.php
+++ b/apps/files_encryption/l10n/it.php
@@ -7,28 +7,30 @@
 "Could not change the password. Maybe the old password was not correct." => "Impossibile cambiare la password. Forse la vecchia password non era corretta.",
 "Private key password successfully updated." => "Password della chiave privata aggiornata correttamente.",
 "Could not update the private key password. Maybe the old password was not correct." => "Impossibile aggiornare la password della chiave privata. Forse la vecchia password non era corretta.",
-"Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files" => "La chiave privata non è valida! Forse la password è stata cambiata dall'esterno. Puoi aggiornare la password della chiave privata nelle impostazioni personali per riottenere l'accesso ai file.",
+"Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files" => "La chiave privata non è valida! Forse la password è stata cambiata dall'esterno. Puoi aggiornare la password della chiave privata nelle impostazioni personali per ottenere nuovamente l'accesso ai file.",
+"PHP module OpenSSL is not installed." => "Il modulo PHP OpenSSL non è installato.",
+"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Chiedi all'amministratore del server di installare il modulo. Per ora la crittografia è disabilitata.",
 "Saving..." => "Salvataggio in corso...",
 "Your private key is not valid! Maybe the your password was changed from outside." => "La tua chiave privata non è valida! Forse è stata modifica dall'esterno.",
-"You can unlock your private key in your " => "Puoi sbloccare la chiave privata nel tuo",
-"personal settings" => "Impostazioni personali",
+"You can unlock your private key in your " => "Puoi sbloccare la chiave privata nelle tue",
+"personal settings" => "impostazioni personali",
 "Encryption" => "Cifratura",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Abilita la chiave di ripristino delle password di cifratura (consente di condividere la chiave di ripristino):",
-"Recovery account password" => "Password di ripristino dell'account",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Abilita la chiave di recupero (permette di recuperare i file utenti in caso di perdita della password):",
+"Recovery key password" => "Password della chiave di recupero",
 "Enabled" => "Abilitata",
 "Disabled" => "Disabilitata",
-"Change encryption passwords recovery key:" => "Cambia la chiave di ripristino delle password di cifratura:",
-"Old Recovery account password" => "Vecchia password di ripristino dell'account",
-"New Recovery account password" => "Nuova password di ripristino dell'account",
+"Change recovery key password:" => "Cambia la password della chiave di recupero:",
+"Old Recovery key password" => "Vecchia password della chiave di recupero",
+"New Recovery key password" => "Nuova password della chiave di recupero",
 "Change Password" => "Modifica password",
-"Your private key password no longer match your log-in password:" => "La password della chiave privata non corrisponde più alla password di login:",
-"Set your old private key password to your current log-in password." => "Imposta la vecchia password della chiave privata sull'attuale password di login",
-" If you don't remember your old password you can ask your administrator to recover your files." => "Se non ricordi la vecchia password puoi chiedere al tuo amministratore di recuperare i file",
-"Old log-in password" => "Password di login vecchia",
-"Current log-in password" => "Password di login corrente",
-"Update Private Key Password" => "Aggiorna la Password della Chiave Privata",
-"Enable password recovery:" => "Abilita il recupero della password:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Abilitando questa opzione potrai riaccedere ai file cifrati nel caso in cui la password venga perduta",
+"Your private key password no longer match your log-in password:" => "La password della chiave privata non corrisponde più alla password di accesso:",
+"Set your old private key password to your current log-in password." => "Imposta la vecchia password della chiave privata sull'attuale password di accesso.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Se non ricordi la vecchia password puoi chiedere al tuo amministratore di recuperare i file.",
+"Old log-in password" => "Vecchia password di accesso",
+"Current log-in password" => "Password di accesso attuale",
+"Update Private Key Password" => "Aggiorna la password della chiave privata",
+"Enable password recovery:" => "Abilita il ripristino della password:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "L'abilitazione di questa opzione ti consentirà di accedere nuovamente ai file cifrati in caso di perdita della password",
 "File recovery settings updated" => "Impostazioni di ripristino dei file aggiornate",
 "Could not update file recovery" => "Impossibile aggiornare il ripristino dei file"
 );
diff --git a/apps/files_encryption/l10n/ja_JP.php b/apps/files_encryption/l10n/ja_JP.php
index 29c2a97cdbd..b8e332672cf 100644
--- a/apps/files_encryption/l10n/ja_JP.php
+++ b/apps/files_encryption/l10n/ja_JP.php
@@ -8,18 +8,20 @@
 "Private key password successfully updated." => "秘密鍵のパスワードが正常に更新されました。",
 "Could not update the private key password. Maybe the old password was not correct." => "秘密鍵のパスワードを更新できませんでした。古いパスワードが正確でない場合があります。",
 "Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files" => "秘密鍵が有効ではありません。パスワードが外部から変更された恐れがあります。。個人設定で秘密鍵のパスワードを更新して、ファイルへのアクセス権を奪還できます。",
+"PHP module OpenSSL is not installed." => "PHPのモジュール OpenSSLがインストールされていません。",
+"Please ask your server administrator to install the module. For now the encryption app was disabled." => "サーバーの管理者にモジュールのインストールを頼んでください。さしあたり暗号化アプリは無効化されました。",
 "Saving..." => "保存中...",
 "Your private key is not valid! Maybe the your password was changed from outside." => "秘密鍵が有効ではありません。パスワードが外部から変更された恐れがあります。",
 "You can unlock your private key in your " => "個人設定で",
 "personal settings" => "秘密鍵をアンロックできます",
 "Encryption" => "暗号化",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "暗号化パスワードの復旧キーを有効にする(復旧キーを共有することを許可):",
-"Recovery account password" => "復旧アカウントのパスワード",
+"Enable recovery key (allow to recover users files in case of password loss):" => "復旧キーを有効化 (万一パスワードを亡くした場合もユーザーのファイルを回復できる):",
+"Recovery key password" => "復旧キーのパスワード",
 "Enabled" => "有効",
 "Disabled" => "無効",
-"Change encryption passwords recovery key:" => "復旧キーの暗号化パスワードを変更:",
-"Old Recovery account password" => "古い復旧アカウントのパスワード",
-"New Recovery account password" => "新しい復旧アカウントのパスワード",
+"Change recovery key password:" => "復旧キーのパスワードを変更:",
+"Old Recovery key password" => "古い復旧キーのパスワード",
+"New Recovery key password" => "新しい復旧キーのパスワード",
 "Change Password" => "パスワードを変更",
 "Your private key password no longer match your log-in password:" => "もはや秘密鍵はログインパスワードと一致しません:",
 "Set your old private key password to your current log-in password." => "古い秘密鍵のパスワードを現在のログインパスワードに設定する。",
diff --git a/apps/files_encryption/l10n/lt_LT.php b/apps/files_encryption/l10n/lt_LT.php
index 16c6cdb40f0..84fa902dc65 100644
--- a/apps/files_encryption/l10n/lt_LT.php
+++ b/apps/files_encryption/l10n/lt_LT.php
@@ -7,13 +7,8 @@
 "Could not change the password. Maybe the old password was not correct." => "Slaptažodis nebuvo pakeistas. Gali būti, kad buvo neteisingai suvestas senasis.",
 "Saving..." => "Saugoma...",
 "Encryption" => "Šifravimas",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Įjungti šifravimo slaptažodžio atstatymo raktą (leidžia dalintis su atstatymo raktu):",
-"Recovery account password" => "Atstatymo vartotojo slaptažodis",
 "Enabled" => "Įjungta",
 "Disabled" => "Išjungta",
-"Change encryption passwords recovery key:" => "Pakeisti šifravimo slaptažodžio atstatymo raktą:",
-"Old Recovery account password" => "Seno atstatymo vartotojo slaptažodis",
-"New Recovery account password" => "naujo atstatymo vartotojo slaptažodis",
 "Change Password" => "Pakeisti slaptažodį",
 "File recovery settings updated" => "Failų atstatymo nustatymai pakeisti",
 "Could not update file recovery" => "Neišėjo atnaujinti failų atkūrimo"
diff --git a/apps/files_encryption/l10n/nl.php b/apps/files_encryption/l10n/nl.php
index 93900c71029..56b4a9bfb38 100644
--- a/apps/files_encryption/l10n/nl.php
+++ b/apps/files_encryption/l10n/nl.php
@@ -5,19 +5,26 @@
 "Could not disable recovery key. Please check your recovery key password!" => "Kon herstelsleutel niet deactiveren. Controleer het wachtwoord van uw herstelsleutel!",
 "Password successfully changed." => "Wachtwoord succesvol gewijzigd.",
 "Could not change the password. Maybe the old password was not correct." => "Kon wachtwoord niet wijzigen. Wellicht oude wachtwoord niet juist ingevoerd.",
+"Private key password successfully updated." => "Privésleutel succesvol bijgewerkt.",
+"Could not update the private key password. Maybe the old password was not correct." => "Kon het wachtwoord van de privésleutel niet wijzigen. Misschien was het oude wachtwoord onjuist.",
+"Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files" => "Uw privésleutel is niet geldig! Misschien was uw wachtwoord van buitenaf gewijzigd. U kunt het wachtwoord van uw privésleutel bijwerking in uw persoonlijke instellingen om bij uw bestanden te komen.",
+"PHP module OpenSSL is not installed." => "PHP module OpenSSL is niet geïnstalleerd.",
+"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Vraag uw beheerder deze module te installeren. Tot zolang is de crypto app gedeactiveerd.",
 "Saving..." => "Opslaan",
 "Your private key is not valid! Maybe the your password was changed from outside." => "Uw privésleutel is niet geldig. Misschien was uw wachtwoord van buitenaf gewijzigd.",
 "You can unlock your private key in your " => "U kunt uw privésleutel deblokkeren in uw",
 "personal settings" => "persoonlijke instellingen",
 "Encryption" => "Versleuteling",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Activeer versleuteling van wachtwoorden herstelsleutel (maak delen met herstel sleutel mogelijk):",
-"Recovery account password" => "Herstel account wachtwoord",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Activeren herstelsleutel (maakt het mogelijk om gebruikersbestanden terug te halen in geval van verlies van het wachtwoord):",
+"Recovery key password" => "Wachtwoord herstelsleulel",
 "Enabled" => "Geactiveerd",
 "Disabled" => "Gedeactiveerd",
-"Change encryption passwords recovery key:" => "Wijzig versleuteling wachtwoord herstelsleutel",
-"Old Recovery account password" => "Oude herstel account wachtwoord",
-"New Recovery account password" => "Nieuwe herstel account wachtwoord",
+"Change recovery key password:" => "Wijzig wachtwoord herstelsleutel:",
+"Old Recovery key password" => "Oude wachtwoord herstelsleutel",
+"New Recovery key password" => "Nieuwe wachtwoord herstelsleutel",
 "Change Password" => "Wijzigen wachtwoord",
+"Your private key password no longer match your log-in password:" => "Het wachtwoord van uw privésleutel komt niet meer overeen met uw inlogwachtwoord:",
+"Set your old private key password to your current log-in password." => "Stel het wachtwoord van uw oude privésleutel in op uw huidige inlogwachtwoord.",
 " If you don't remember your old password you can ask your administrator to recover your files." => "Als u uw oude wachtwoord niet meer weet, kunt u uw beheerder vragen uw bestanden terug te halen.",
 "Old log-in password" => "Oude wachtwoord",
 "Current log-in password" => "Huidige wachtwoord",
diff --git a/apps/files_encryption/l10n/pl.php b/apps/files_encryption/l10n/pl.php
index cbb790080e8..6a28f859943 100644
--- a/apps/files_encryption/l10n/pl.php
+++ b/apps/files_encryption/l10n/pl.php
@@ -8,18 +8,15 @@
 "Private key password successfully updated." => "Pomyślnie zaktualizowano hasło klucza prywatnego.",
 "Could not update the private key password. Maybe the old password was not correct." => "Nie można zmienić prywatnego hasła. Może stare hasło nie było poprawne.",
 "Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files" => "Klucz prywatny nie jest poprawny! Może Twoje hasło zostało zmienione z zewnątrz. Można zaktualizować hasło klucza prywatnego w ustawieniach osobistych w celu odzyskania dostępu do plików",
+"PHP module OpenSSL is not installed." => "Moduł PHP OpenSSL nie jest zainstalowany",
+"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Proszę poproś administratora serwera aby zainstalował ten moduł. Obecnie aplikacja szyfrowanie została wyłączona.",
 "Saving..." => "Zapisywanie...",
 "Your private key is not valid! Maybe the your password was changed from outside." => "Klucz prywatny nie jest poprawny! Może Twoje hasło zostało zmienione z zewnątrz.",
 "You can unlock your private key in your " => "Możesz odblokować swój klucz prywatny w swojej",
 "personal settings" => "Ustawienia osobiste",
 "Encryption" => "Szyfrowanie",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Włącz szyfrowanie odzyskiwanych haseł klucza (zezwalaj na odzyskiwanie klucza):",
-"Recovery account password" => "Odzyskiwanie hasła konta",
 "Enabled" => "Włączone",
 "Disabled" => "Wyłączone",
-"Change encryption passwords recovery key:" => "Zmiana klucza szyfrowania haseł odzyskiwania:",
-"Old Recovery account password" => "Stare hasło odzyskiwania",
-"New Recovery account password" => "Nowe hasło odzyskiwania",
 "Change Password" => "Zmień hasło",
 "Your private key password no longer match your log-in password:" => "Hasło klucza prywatnego nie pasuje do  hasła logowania:",
 "Set your old private key password to your current log-in password." => "Podaj swoje stare prywatne hasło aby ustawić nowe",
diff --git a/apps/files_encryption/l10n/pt_BR.php b/apps/files_encryption/l10n/pt_BR.php
index 868dfc4453c..cb1678541bf 100644
--- a/apps/files_encryption/l10n/pt_BR.php
+++ b/apps/files_encryption/l10n/pt_BR.php
@@ -5,16 +5,32 @@
 "Could not disable recovery key. Please check your recovery key password!" => "Impossível desabilitar recuperação de chave. Por favor verifique sua senha para recuperação de chave!",
 "Password successfully changed." => "Senha alterada com sucesso.",
 "Could not change the password. Maybe the old password was not correct." => "Não foi possível alterar a senha. Talvez a senha antiga não estava correta.",
+"Private key password successfully updated." => "Senha de chave privada atualizada com sucesso.",
+"Could not update the private key password. Maybe the old password was not correct." => "Não foi possível atualizar a senha de chave privada. Talvez a senha antiga esteja incorreta.",
+"Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files" => "Sua chave privada não é válida! Talvez sua senha tenha sido mudada. Você pode atualizar sua senha de chave privada nas suas configurações pessoais para obter novamente acesso aos seus arquivos.",
+"PHP module OpenSSL is not installed." => "O módulo PHP OpenSSL não está instalado.",
+"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Por favor peça ao administrador do servidor para instalar o módulo. Por enquanto o app de encriptação foi desabilitada.",
 "Saving..." => "Salvando...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "Sua chave privada não é válida! Talvez sua senha tenha sido mudada.",
+"You can unlock your private key in your " => "Você pode desbloquear sua chave privada nas suas",
+"personal settings" => "configurações pessoais.",
 "Encryption" => "Criptografia",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Ativar a criptografia de chave de recuperação de senhas (permitir compartilhar a chave de recuperação):",
-"Recovery account password" => "Recuperar a senha da conta",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Habilitar chave de recuperação (permite recuperar arquivos de usuários em caso de perda de senha):",
+"Recovery key password" => "Senha da chave de recuperação",
 "Enabled" => "Habilidado",
 "Disabled" => "Desabilitado",
-"Change encryption passwords recovery key:" => "Mudar a criptografia de chave de recuperação de senhas:",
-"Old Recovery account password" => "Recuperação de senha de conta antiga",
-"New Recovery account password" => "Senha Nova  da conta de Recuperação",
+"Change recovery key password:" => "Mudar a senha da chave de recuperação:",
+"Old Recovery key password" => "Senha antiga da chave de recuperação",
+"New Recovery key password" => "Nova senha da chave de recuperação",
 "Change Password" => "Trocar Senha",
+"Your private key password no longer match your log-in password:" => "Sua senha de chave privada não coincide mais com sua senha de login:",
+"Set your old private key password to your current log-in password." => "Configure sua antiga senha de chave privada para sua atual senha de login.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Se você não se lembra de sua antiga senha você pode pedir ao administrador que recupere seus arquivos.",
+"Old log-in password" => "Senha antiga de login",
+"Current log-in password" => "Atual senha de login",
+"Update Private Key Password" => "Atualizar senha de chave privada",
+"Enable password recovery:" => "Habilitar recuperação de senha:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Habilitar essa opção vai permitir que você obtenha novamente acesso aos seus arquivos encriptados em caso de perda de senha",
 "File recovery settings updated" => "Configurações de recuperação de arquivo atualizado",
 "Could not update file recovery" => "Não foi possível atualizar a recuperação de arquivos"
 );
diff --git a/apps/files_encryption/l10n/pt_PT.php b/apps/files_encryption/l10n/pt_PT.php
index 8993cb63699..f485f373a53 100644
--- a/apps/files_encryption/l10n/pt_PT.php
+++ b/apps/files_encryption/l10n/pt_PT.php
@@ -7,13 +7,8 @@
 "Could not change the password. Maybe the old password was not correct." => "Não foi possivel alterar a password. Possivelmente a password antiga não está correcta.",
 "Saving..." => "A guardar...",
 "Encryption" => "Encriptação",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Activar a chave de recuperação das passwords de encriptação (permitir partilha da chave de recuperação):",
-"Recovery account password" => "Password de recuperação de conta",
 "Enabled" => "Activado",
 "Disabled" => "Desactivado",
-"Change encryption passwords recovery key:" => "Alterar a chave de recuperação da password de encriptação:",
-"Old Recovery account password" => "Password de recuperação de conta antiga:",
-"New Recovery account password" => "Nova password de recuperação de conta",
 "Change Password" => "Mudar a Password",
 "File recovery settings updated" => "Actualizadas as definições de recuperação de ficheiros",
 "Could not update file recovery" => "Não foi possível actualizar a recuperação de ficheiros"
diff --git a/apps/files_encryption/l10n/ru.php b/apps/files_encryption/l10n/ru.php
index d10bfa7e783..9b90a5110e1 100644
--- a/apps/files_encryption/l10n/ru.php
+++ b/apps/files_encryption/l10n/ru.php
@@ -1,16 +1,16 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Ключ восстановления успешно установлен",
+"Recovery key successfully disabled" => "Ключ восстановления успешно отключен",
 "Password successfully changed." => "Пароль изменен удачно.",
 "Could not change the password. Maybe the old password was not correct." => "Невозможно изменить пароль. Возможно старый пароль не был верен.",
 "Saving..." => "Сохранение...",
+"personal settings" => "персональные настройки",
 "Encryption" => "Шифрование",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Включить шифрование пароля ключа восстановления (понадобится разрешение для восстановления ключа)",
-"Recovery account password" => "Восстановление пароля учетной записи",
 "Enabled" => "Включено",
 "Disabled" => "Отключено",
-"Change encryption passwords recovery key:" => "Изменить шифрование пароля ключа восстановления:",
-"Old Recovery account password" => "Старое Восстановление пароля учетной записи",
-"New Recovery account password" => "Новое Восстановление пароля учетной записи",
 "Change Password" => "Изменить пароль",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Если вы не помните свой старый пароль, вы можете попросить своего администратора восстановить ваши файлы",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Включение этой опции позволит вам получить доступ к своим зашифрованным файлам в случае утери пароля",
 "File recovery settings updated" => "Настройки файла восстановления обновлены",
 "Could not update file recovery" => "Невозможно обновить файл восстановления"
 );
diff --git a/apps/files_encryption/l10n/sk_SK.php b/apps/files_encryption/l10n/sk_SK.php
index 279481fbd4f..b01c7f709d8 100644
--- a/apps/files_encryption/l10n/sk_SK.php
+++ b/apps/files_encryption/l10n/sk_SK.php
@@ -1,11 +1,28 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Záchranný kľúč bol úspešne povolený",
+"Could not enable recovery key. Please check your recovery key password!" => "Nepodarilo sa povoliť záchranný kľúč. Skontrolujte prosím Vaše heslo záchranného kľúča!",
+"Recovery key successfully disabled" => "Záchranný kľúč bol úspešne zakázaný",
+"Could not disable recovery key. Please check your recovery key password!" => "Nepodarilo sa zakázať záchranný kľúč. Skontrolujte prosím Vaše heslo záchranného kľúča!",
 "Password successfully changed." => "Heslo úspešne zmenené.",
+"Could not change the password. Maybe the old password was not correct." => "Nemožno zmeniť heslo. Pravdepodobne nebolo staré heslo zadané správne.",
+"Private key password successfully updated." => "Heslo súkromného kľúča je úspešne aktualizované.",
+"Could not update the private key password. Maybe the old password was not correct." => "Nemožno aktualizovať heslo súkromného kľúča. Možno nebolo staré heslo správne.",
+"Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files" => "Váš súkromný kľúč je neplatný. Možno bolo Vaše heslo zmenené z vonku. Môžete aktualizovať heslo súkromného kľúča v osobnom nastavení na opätovné získanie prístupu k súborom",
 "Saving..." => "Ukladám...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "Váš súkromný kľúč je neplatný. Možno bolo Vaše heslo zmenené z vonku.",
+"personal settings" => "osobné nastavenia",
 "Encryption" => "Šifrovanie",
 "Enabled" => "Povolené",
 "Disabled" => "Zakázané",
-"Change encryption passwords recovery key:" => "Zmeniť šifrovacie heslo obnovovacieho kľúča:",
 "Change Password" => "Zmeniť heslo",
+"Your private key password no longer match your log-in password:" => "Vaše heslo súkromného kľúča je rovnaké ako Vaše prihlasovacie heslo:",
+"Set your old private key password to your current log-in password." => "Nastavte si staré heslo súkromného kľúča k Vášmu súčasnému prihlasovaciemu heslu.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Ak si nepamätáte svoje staré heslo, môžete požiadať správcu o obnovenie svojich súborov.",
+"Old log-in password" => "Staré prihlasovacie heslo",
+"Current log-in password" => "Súčasné prihlasovacie heslo",
+"Update Private Key Password" => "Aktualizovať heslo súkromného kľúča",
+"Enable password recovery:" => "Povoliť obnovu hesla:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Povolenie Vám umožní znovu získať prístup k Vašim zašifrovaným súborom, ak stratíte heslo",
 "File recovery settings updated" => "Nastavenie obnovy súborov aktualizované",
 "Could not update file recovery" => "Nemožno aktualizovať obnovenie súborov"
 );
diff --git a/apps/files_encryption/l10n/sl.php b/apps/files_encryption/l10n/sl.php
index a420fe161df..d80613b4b12 100644
--- a/apps/files_encryption/l10n/sl.php
+++ b/apps/files_encryption/l10n/sl.php
@@ -1,4 +1,14 @@
 <?php $TRANSLATIONS = array(
+"Password successfully changed." => "Geslo je bilo uspešno spremenjeno.",
+"Could not change the password. Maybe the old password was not correct." => "Gesla ni bilo mogoče spremeniti. Morda vnos starega gesla ni bil pravilen.",
 "Saving..." => "Poteka shranjevanje ...",
-"Encryption" => "Šifriranje"
+"personal settings" => "osebne nastavitve",
+"Encryption" => "Šifriranje",
+"Enabled" => "Omogočeno",
+"Disabled" => "Onemogočeno",
+"Change Password" => "Spremeni geslo",
+"Old log-in password" => "Staro geslo",
+"Current log-in password" => "Trenutno geslo",
+"File recovery settings updated" => "Nastavitve obnavljanja dokumentov so bile posodobljene",
+"Could not update file recovery" => "Nastavitev za obnavljanje dokumentov ni bilo mogoče posodobiti"
 );
diff --git a/apps/files_encryption/l10n/sv.php b/apps/files_encryption/l10n/sv.php
index 7d17a0adc60..d3d317f2108 100644
--- a/apps/files_encryption/l10n/sv.php
+++ b/apps/files_encryption/l10n/sv.php
@@ -13,13 +13,8 @@
 "You can unlock your private key in your " => "Du kan låsa upp din privata nyckel i dina",
 "personal settings" => "personliga inställningar",
 "Encryption" => "Kryptering",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Aktivera återställningsnyckel för krypterade lösenord. (tillåt delning till återställningsnyckeln):",
-"Recovery account password" => "Återställning av kontolösenord",
 "Enabled" => "Aktiverad",
 "Disabled" => "Inaktiverad",
-"Change encryption passwords recovery key:" => "Ändra återställningsnyckeln för krypterade lösenord:",
-"Old Recovery account password" => "Gamla lösenordet för återställningskontot",
-"New Recovery account password" => "Nytt återställningslösenord för kontot",
 "Change Password" => "Byt lösenord",
 "Your private key password no longer match your log-in password:" => "Din privata lösenordsnyckel stämmer inte längre överrens med ditt inloggningslösenord:",
 "Set your old private key password to your current log-in password." => "Ställ in din gamla privata lösenordsnyckel till ditt aktuella inloggningslösenord.",
@@ -28,6 +23,7 @@
 "Current log-in password" => "Nuvarande inloggningslösenord",
 "Update Private Key Password" => "Uppdatera den privata lösenordsnyckeln",
 "Enable password recovery:" => "Aktivera lösenordsåterställning",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Genom att aktivera detta alternativ kommer du kunna återfå tillgång till dina krypterade filer om du skulle förlora/glömma ditt lösenord",
 "File recovery settings updated" => "Inställningarna för filåterställning har uppdaterats",
 "Could not update file recovery" => "Kunde inte uppdatera filåterställning"
 );
diff --git a/apps/files_encryption/l10n/tr.php b/apps/files_encryption/l10n/tr.php
index 59b91de928a..24c6fa47278 100644
--- a/apps/files_encryption/l10n/tr.php
+++ b/apps/files_encryption/l10n/tr.php
@@ -7,13 +7,8 @@
 "Could not change the password. Maybe the old password was not correct." => "Parola değiştirilemedi. Eski parolanız doğru olmayabilir",
 "Saving..." => "Kaydediliyor...",
 "Encryption" => "Şifreleme",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Şifreli parola kurtarma anahtarını etkinleştir(kurtarma anahtarı paylaşımına izin ver)",
-"Recovery account password" => "Kurtarma hesabı parolası",
 "Enabled" => "Etkinleştirildi",
 "Disabled" => "Devre dışı",
-"Change encryption passwords recovery key:" => "Şifreli parolalar kurtarma anahtarını değiştir:",
-"Old Recovery account password" => "Eski kurtarma hesabı parolası",
-"New Recovery account password" => "Yeni kurtarma hesabı parolası",
 "Change Password" => "Parola değiştir",
 "File recovery settings updated" => "Dosya kurtarma ayarları güncellendi",
 "Could not update file recovery" => "Dosya kurtarma güncellenemedi"
diff --git a/apps/files_encryption/l10n/vi.php b/apps/files_encryption/l10n/vi.php
index 3e76060b1de..d11569bb94c 100644
--- a/apps/files_encryption/l10n/vi.php
+++ b/apps/files_encryption/l10n/vi.php
@@ -3,7 +3,6 @@
 "Could not change the password. Maybe the old password was not correct." => "Không thể đổi mật khẩu. Có lẽ do mật khẩu cũ không đúng.",
 "Saving..." => "Đang lưu...",
 "Encryption" => "Mã hóa",
-"Recovery account password" => "Mật khẩu cho tài khoản cứu hộ",
 "Enabled" => "Bật",
 "Disabled" => "Tắt",
 "Change Password" => "Đổi Mật khẩu"
diff --git a/apps/files_encryption/l10n/zh_CN.php b/apps/files_encryption/l10n/zh_CN.php
index c64ae9dcd48..6d6d457f439 100644
--- a/apps/files_encryption/l10n/zh_CN.php
+++ b/apps/files_encryption/l10n/zh_CN.php
@@ -7,13 +7,8 @@
 "Could not change the password. Maybe the old password was not correct." => "不能修改密码。旧密码可能不正确。",
 "Saving..." => "保存中",
 "Encryption" => "加密",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "启用加密密码恢复密钥（允许共享恢复密钥）：",
-"Recovery account password" => "恢复账户密码",
 "Enabled" => "开启",
 "Disabled" => "禁用",
-"Change encryption passwords recovery key:" => "变更加密密码恢复密钥：",
-"Old Recovery account password" => "旧恢复账号密码",
-"New Recovery account password" => "新恢复账号密码",
 "Change Password" => "修改密码",
 "File recovery settings updated" => "文件恢复设置已更新",
 "Could not update file recovery" => "不能更新文件恢复"
diff --git a/apps/files_encryption/l10n/zh_TW.php b/apps/files_encryption/l10n/zh_TW.php
index 77efdb3e566..d34f51c4870 100644
--- a/apps/files_encryption/l10n/zh_TW.php
+++ b/apps/files_encryption/l10n/zh_TW.php
@@ -5,7 +5,6 @@
 "Encryption" => "加密",
 "Enabled" => "已啓用",
 "Disabled" => "已停用",
-"Change encryption passwords recovery key:" => "變更加密密碼還原金鑰：",
 "Change Password" => "變更密碼",
 "File recovery settings updated" => "檔案還原設定已更新",
 "Could not update file recovery" => "無法更新檔案還原設定"
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 945b342a316..927064012b6 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -51,21 +51,26 @@ class Crypt {
 	 */

 	public static function createKeypair() {

 

-		$res = openssl_pkey_new(array('private_key_bits' => 4096));

-

-		// Get private key

-		openssl_pkey_export($res, $privateKey);

+		$return = false;

 

-		// Get public key

-		$publicKey = openssl_pkey_get_details($res);

+		$res = openssl_pkey_new(array('private_key_bits' => 4096));

 

-		$publicKey = $publicKey['key'];

+		if ($res === false) {

+			\OCP\Util::writeLog('Encryption library', 'couldn\'t generate users key-pair for ' . \OCP\User::getUser(), \OCP\Util::ERROR);

+		} elseif (openssl_pkey_export($res, $privateKey)) {

+			// Get public key

+			$publicKey = openssl_pkey_get_details($res);

+			$publicKey = $publicKey['key'];

 

-		return (array(

-			'publicKey' => $publicKey,

-			'privateKey' => $privateKey

-		));

+			$return = array(

+				'publicKey' => $publicKey,

+				'privateKey' => $privateKey

+			);

+		} else {

+			\OCP\Util::writeLog('Encryption library', 'couldn\'t export users private key, please check your servers openSSL configuration.' . \OCP\User::getUser(), \OCP\Util::ERROR);

+		}

 

+		return $return;

 	}

 

 	/**

@@ -287,28 +292,22 @@ class Crypt {
 	public static function symmetricEncryptFileContent($plainContent, $passphrase = '') {

 

 		if (!$plainContent) {

-

+			\OCP\Util::writeLog('Encryption library', 'symmetrically encryption failed, no content given.', \OCP\Util::ERROR);

 			return false;

-

 		}

 

 		$iv = self::generateIv();

 

 		if ($encryptedContent = self::encrypt($plainContent, $iv, $passphrase)) {

-

 			// Combine content to encrypt with IV identifier and actual IV

 			$catfile = self::concatIv($encryptedContent, $iv);

-

 			$padded = self::addPadding($catfile);

 

 			return $padded;

 

 		} else {

-

 			\OCP\Util::writeLog('Encryption library', 'Encryption (symmetric) of keyfile content failed', \OCP\Util::ERROR);

-

 			return false;

-

 		}

 

 	}

diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index b4b3923a799..e8e53859bd8 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -228,18 +228,21 @@ class Util {
 			// Generate keypair
 			$keypair = Crypt::createKeypair();
 
-			\OC_FileProxy::$enabled = false;
+			if ($keypair) {
 
-			// Save public key
-			$this->view->file_put_contents($this->publicKeyPath, $keypair['publicKey']);
+				\OC_FileProxy::$enabled = false;
 
-			// Encrypt private key with user pwd as passphrase
-			$encryptedPrivateKey = Crypt::symmetricEncryptFileContent($keypair['privateKey'], $passphrase);
+				// Encrypt private key with user pwd as passphrase
+				$encryptedPrivateKey = Crypt::symmetricEncryptFileContent($keypair['privateKey'], $passphrase);
 
-			// Save private key
-			$this->view->file_put_contents($this->privateKeyPath, $encryptedPrivateKey);
+				// Save key-pair
+				if ($encryptedPrivateKey) {
+					$this->view->file_put_contents($this->privateKeyPath, $encryptedPrivateKey);
+					$this->view->file_put_contents($this->publicKeyPath, $keypair['publicKey']);
+				}
 
-			\OC_FileProxy::$enabled = true;
+				\OC_FileProxy::$enabled = true;
+			}
 
 		} else {
 			// check if public-key exists but private-key is missing
diff --git a/apps/files_encryption/templates/settings-admin.php b/apps/files_encryption/templates/settings-admin.php
index c420b006c45..f5f7582c2a6 100644
--- a/apps/files_encryption/templates/settings-admin.php
+++ b/apps/files_encryption/templates/settings-admin.php
@@ -7,11 +7,11 @@
 		</p>
 
 		<p>
-			<?php p($l->t("Enable encryption passwords recovery key (allow sharing to recovery key):")); ?>
+			<?php p($l->t("Enable recovery key (allow to recover users files in case of password loss):")); ?>
 			<br/>
 			<br/>
 			<input type="password" name="recoveryPassword" id="recoveryPassword"/>
-			<label for="recoveryPassword"><?php p($l->t("Recovery account password")); ?></label>
+			<label for="recoveryPassword"><?php p($l->t("Recovery key password")); ?></label>
 			<br/>
 			<input
 				type='radio'
@@ -31,21 +31,21 @@
 		<br/><br/>
 
 		<p>
-			<strong><?php p($l->t("Change encryption passwords recovery key:")); ?></strong>
+			<strong><?php p($l->t("Change recovery key password:")); ?></strong>
 			<br/><br/>
 			<input
 				type="password"
 				name="changeRecoveryPassword"
 				id="oldRecoveryPassword"
 				<?php echo($_["recoveryEnabled"] == 0 ? 'disabled' : ''); ?> />
-			<label for="oldRecoveryPassword"><?php p($l->t("Old Recovery account password")); ?></label>
+			<label for="oldRecoveryPassword"><?php p($l->t("Old Recovery key password")); ?></label>
 			<br/>
 			<input
 				type="password"
 				name="changeRecoveryPassword"
 				id="newRecoveryPassword"
 				<?php echo($_["recoveryEnabled"] == 0 ? 'disabled' : ''); ?> />
-			<label for="newRecoveryPassword"><?php p($l->t("New Recovery account password")); ?></label>
+			<label for="newRecoveryPassword"><?php p($l->t("New Recovery key password")); ?></label>
 			<br/>
 			<button
 				type="button"
diff --git a/apps/files_external/l10n/ko.php b/apps/files_external/l10n/ko.php
index 47de9aad5e0..803b489c218 100644
--- a/apps/files_external/l10n/ko.php
+++ b/apps/files_external/l10n/ko.php
@@ -6,11 +6,14 @@
 "Error configuring Google Drive storage" => "Google 드라이브 저장소 설정 오류",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>경고:</b> \"smbclient\"가 설치되지 않았습니다. CIFS/SMB 공유 자원에 연결할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>경고:</b> PHP FTP 지원이 비활성화되어 있거나 설치되지 않았습니다. FTP 공유를 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>경고:</b> PHP Curl 지원이 비활성화되어 있거나 설치되지 않았습니다. 다른 ownCloud, WebDAV, Google 드라이브 공유를 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
 "External Storage" => "외부 저장소",
 "Folder name" => "폴더 이름",
+"External storage" => "외부 저장소",
 "Configuration" => "설정",
 "Options" => "옵션",
 "Applicable" => "적용 가능",
+"Add storage" => "저장소 추가",
 "None set" => "설정되지 않음",
 "All Users" => "모든 사용자",
 "Groups" => "그룹",
diff --git a/apps/files_trashbin/l10n/eo.php b/apps/files_trashbin/l10n/eo.php
index 3288c4fcdc5..161e9c3e88a 100644
--- a/apps/files_trashbin/l10n/eo.php
+++ b/apps/files_trashbin/l10n/eo.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Error" => "Eraro",
+"Delete permanently" => "Forigi por ĉiam",
 "Name" => "Nomo",
 "1 folder" => "1 dosierujo",
 "{count} folders" => "{count} dosierujoj",
diff --git a/apps/files_versions/l10n/ko.php b/apps/files_versions/l10n/ko.php
index 994144f39e1..df34e4681b4 100644
--- a/apps/files_versions/l10n/ko.php
+++ b/apps/files_versions/l10n/ko.php
@@ -1,11 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Could not revert: %s" => "되돌릴 수 없습니다: %s",
-"success" => "완료",
-"File %s was reverted to version %s" => "파일 %s를 버전 %s로 변경하였습니다.",
+"success" => "성공",
+"File %s was reverted to version %s" => "파일 %s을(를) 버전 %s(으)로 되돌림",
 "failure" => "실패",
-"File %s could not be reverted to version %s" => "파일 %s를 버전 %s로 되돌리지 못했습니다.",
-"No old versions available" => "오래된 버전을 사용할 수 없습니다",
-"No path specified" => "경로를 알수 없습니다.",
-"Versions" => "버젼",
-"Revert a file to a previous version by clicking on its revert button" => "변경 버튼을 클릭하여 이전 버전의 파일로 변경할 수 있습니다."
+"File %s could not be reverted to version %s" => "파일 %s을(를) 버전 %s(으)로 되돌리지 못했음",
+"No old versions available" => "오래된 버전을 사용할 수 없음",
+"No path specified" => "경로가 지정되지 않았음",
+"Versions" => "버전",
+"Revert a file to a previous version by clicking on its revert button" => "변경 단추를 눌러 이전 버전의 파일로 되돌릴 수 있습니다"
 );
diff --git a/apps/user_ldap/l10n/es_AR.php b/apps/user_ldap/l10n/es_AR.php
index 011ff3e12ff..6925ea89a0c 100644
--- a/apps/user_ldap/l10n/es_AR.php
+++ b/apps/user_ldap/l10n/es_AR.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Hubo un error al borrar las asignaciones.",
 "Failed to delete the server configuration" => "Fallo al borrar la configuración del servidor",
 "The configuration is valid and the connection could be established!" => "La configuración es válida y la conexión pudo ser establecida.",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "La configuración es válida, pero el enlace falló. Por favor, comprobá la configuración del servidor y las credenciales.",
@@ -7,6 +8,7 @@
 "Take over settings from recent server configuration?" => "Tomar los valores de la anterior configuración de servidor?",
 "Keep settings?" => "¿Mantener preferencias?",
 "Cannot add server configuration" => "No se pudo añadir la configuración del servidor",
+"mappings cleared" => "Asignaciones borradas",
 "Success" => "Éxito",
 "Error" => "Error",
 "Connection test succeeded" => "El este de conexión ha sido completado satisfactoriamente",
@@ -72,6 +74,16 @@
 "Email Field" => "Campo de e-mail",
 "User Home Folder Naming Rule" => "Regla de nombre de los directorios de usuario",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Vacío para el nombre de usuario (por defecto). En otro caso, especificá un atributo LDAP/AD.",
+"Internal Username" => "Nombre interno de usuario",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Por defecto, el nombre interno de usuario va a ser creado a partir del atributo UUID. Esto asegura que el nombre de usuario es único y los caracteres no necesitan ser convertidos. Para el nombre de usuario interno sólo se pueden usar estos caracteres: [a-zA-Z0-9_.@-]. Otros caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. Si ocurrieran colisiones, un número será añadido o incrementado. El nombre interno de usuario se usa para identificar un usuario internamente. Es también el nombre por defecto para el directorio personal del usuario in ownCloud. También es un puerto de URLs remotas, por ejemplo, para todos los servicios *DAV. Con esta configuración el comportamiento por defecto puede ser cambiado. Para conseguir un comportamiento similar al anterior a ownCloud 5, ingresá el atributo del nombre en pantalla del usuario en el siguiente campo. Dejalo vacío para el comportamiento por defecto. Los cambios solo tendrán efecto para los nuevos usuarios LDAP.",
+"Internal Username Attribute:" => "Atributo Nombre Interno de usuario:",
+"Override UUID detection" => "Sobrescribir la detección UUID",
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Por defecto, ownCloud detecta automáticamente el atributo UUID. El atributo UUID se usa para identificar indudablemente usuarios y grupos LDAP. Además, el nombre de usuario interno va a ser creado en base al UUID, si no ha sido especificado otro comportamiento arriba. Podés sobrescribir la configuración y pasar un atributo de tu elección. Tenés que asegurarte de que el atributo de tu elección sea accesible por los usuarios y grupos y ser único. Dejalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto sólo en los nuevos usuarios y grupos de LDAP.",
+"UUID Attribute:" => "Atributo UUID:",
+"Username-LDAP User Mapping" => "Asignación del Nombre de usuario de un usuario LDAP",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud usa nombres de usuario para almacenar y asignar (meta) datos. Con el fin de identificar con precisión y reconocer usuarios, cada usuario LDAP tendrá un nombre de usuario interno. Esto requiere una asignación de nombre de usuario de ownCloud a usuario LDAP. El nombre de usuario creado se asigna al UUID del usuario LDAP. Además el DN se almacena en caché principalmente para reducir la interacción de LDAP, pero no se utiliza para la identificación. Si la DN cambia, los cambios serán encontrados por ownCloud. El nombre interno de ownCloud se utiliza para todo en ownCloud. Borrar las asignaciones dejará restos en distintos lugares. Borrar las asignaciones no depende de la configuración, ¡afecta a todas las configuraciones de LDAP! No borrar nunca las asignaciones en un entorno de producción. Sólo borrar asignaciones en una situación de prueba o experimental.",
+"Clear Username-LDAP User Mapping" => "Borrar la asignación de los Nombres de usuario de los usuarios LDAP",
+"Clear Groupname-LDAP Group Mapping" => "Borrar la asignación de los Nombres de grupo de los grupos de LDAP",
 "Test Configuration" => "Probar configuración",
 "Help" => "Ayuda"
 );
diff --git a/apps/user_ldap/l10n/ru.php b/apps/user_ldap/l10n/ru.php
index 0573be3993f..d88b20dc469 100644
--- a/apps/user_ldap/l10n/ru.php
+++ b/apps/user_ldap/l10n/ru.php
@@ -75,10 +75,13 @@
 "User Home Folder Naming Rule" => "Правило именования Домашней Папки Пользователя",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Оставьте имя пользователя пустым (по умолчанию). Иначе укажите атрибут LDAP/AD.",
 "Internal Username" => "Внутреннее имя пользователя",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "По-умолчанию внутреннее имя пользователя будет создано из атрибута UUID. Это необходимо для того, чтобы имя пользователя было уникальным и не содержало в себе запрещенных символов. Внутреннее имя пользователя может состоять только из следующих символов: [ a-zA-Z0-9_.@- ]. Остальные символы замещаются соответствиями из таблицы ASCII или же просто пропускаются. При совпадении к имени будет добавлено число. Внутреннее имя пользователя используется для внутренней идентификации пользователя. Также оно является именем по-умолчанию для папки пользователя в ownCloud. Оно также портом для удаленных ссылок, к примеру, для всех сервисов *DAV. С помощию данной настройки можно изменить поведение по-умолчанию. Чтобы достичь поведения, как было настроено до изменения, ownCloud 5 выводит атрибут имени пользователя в этом поле. Оставьте его пустым для режима по-умолчанию. Изменения будут иметь эффект только для новых подключенных (добавленных) пользователей LDAP.",
 "Internal Username Attribute:" => "Аттрибут для внутреннего имени:",
 "Override UUID detection" => "Переопределить нахождение UUID",
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "По-умолчанию, ownCloud определяет атрибут UUID автоматически. Этот атрибут используется для того, чтобы достоверно индентифицировать пользователей и группы LDAP. Также, на основании атрибута UUID создается внутреннее имя пользователя, если выше не указано иначе. Вы можете переопределить эту настройку и указать свой атрибут по выбору. Вы должны удостовериться, что выбранный вами атрибут может быть выбран для пользователей и групп, а также то, что он уникальный. Оставьте поле пустым для поведения по-умолчанию. Изменения вступят в силу только для новых подключенных (добавленных) пользователей и групп LDAP.",
 "UUID Attribute:" => "Аттрибут для UUID:",
 "Username-LDAP User Mapping" => "Соответствия Имя-Пользователь LDAP",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud использует имена пользователей для хранения и назначения метаданных. Для точной идентификации и распознавания пользователей, каждый пользователь LDAP будет иметь свое внутреннее имя пользователя. Это требует наличия соответствия имени пользователя ownCloud к пользователю LDAP. При создании имя пользователя назначается идентификатору UUID пользователя LDAP. Помимо этого кэшируется доменное имя (DN) для снижения взаимодействия LDAP, однако оно не используется для идентификации. Если доменное имя было изменено, об этом станет известно ownCloud. Внутреннее имя ownCloud используется повсеместно в ownCloud. При очистке соответствий повсюду будут оставаться \"хвосты\". Очистка соответствий не привязана к конкретной конфигурации, она влияет на все конфигурации LDAP! Никогда не очищайте соответствия в рабочем окружении. Очищайте соответствия только во время тестов или в экспериментальных конфигурациях.",
 "Clear Username-LDAP User Mapping" => "Очистить соответствия Имя-Пользователь LDAP",
 "Clear Groupname-LDAP Group Mapping" => "Очистить соответствия Группа-Группа LDAP",
 "Test Configuration" => "Тестовая конфигурация",
diff --git a/apps/user_ldap/l10n/sk_SK.php b/apps/user_ldap/l10n/sk_SK.php
index e36a1589367..fe1e14ea6fd 100644
--- a/apps/user_ldap/l10n/sk_SK.php
+++ b/apps/user_ldap/l10n/sk_SK.php
@@ -79,6 +79,9 @@
 "Internal Username Attribute:" => "Atribút interného používateľského mena:",
 "Override UUID detection" => "Prepísať UUID detekciu",
 "UUID Attribute:" => "UUID atribút:",
+"Username-LDAP User Mapping" => "Mapovanie názvov LDAP používateľských mien",
+"Clear Username-LDAP User Mapping" => "Zrušiť mapovanie LDAP používateľských mien",
+"Clear Groupname-LDAP Group Mapping" => "Zrušiť mapovanie názvov LDAP skupín",
 "Test Configuration" => "Test nastavenia",
 "Help" => "Pomoc"
 );
diff --git a/apps/user_webdavauth/l10n/de_DE.php b/apps/user_webdavauth/l10n/de_DE.php
index 4ca749e898d..21a886343f0 100644
--- a/apps/user_webdavauth/l10n/de_DE.php
+++ b/apps/user_webdavauth/l10n/de_DE.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV-Authentifizierung",
+"URL: " => "URL:",
 "ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud sendet die Benutzerdaten an diese URL. Dieses Plugin prüft die Antwort und wird die Statuscodes 401 und 403 als ungültige Daten und alle anderen Antworten als gültige Daten interpretieren."
 );
diff --git a/apps/user_webdavauth/l10n/el.php b/apps/user_webdavauth/l10n/el.php
index 1943b98a750..79bb1d13bf7 100644
--- a/apps/user_webdavauth/l10n/el.php
+++ b/apps/user_webdavauth/l10n/el.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "Αυθεντικοποίηση μέσω WebDAV ",
+"URL: " => "URL:",
 "ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Το ownCloud θα στείλει τα διαπιστευτήρια  χρήστη σε αυτό το URL. Αυτό το plugin ελέγχει την απάντηση και την μετατρέπει σε HTTP κωδικό κατάστασης 401 και 403 για μη έγκυρα, όλες οι υπόλοιπες απαντήσεις είναι έγκυρες."
 );
diff --git a/apps/user_webdavauth/l10n/es_AR.php b/apps/user_webdavauth/l10n/es_AR.php
index efb82288287..cda5d7eab05 100644
--- a/apps/user_webdavauth/l10n/es_AR.php
+++ b/apps/user_webdavauth/l10n/es_AR.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "Autenticación de WevDAV",
+"URL: " => "URL: ",
 "ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "onwCloud enviará las credenciales de usuario a esta URL. Este complemento verifica la respuesta e interpretará los códigos de respuesta HTTP 401 y 403 como credenciales inválidas y todas las otras respuestas como credenciales válidas."
 );
diff --git a/apps/user_webdavauth/l10n/pt_BR.php b/apps/user_webdavauth/l10n/pt_BR.php
index 1f96b75462a..6727219db42 100644
--- a/apps/user_webdavauth/l10n/pt_BR.php
+++ b/apps/user_webdavauth/l10n/pt_BR.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "Autenticação WebDAV",
+"URL: " => "URL:",
 "ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "O ownCloud enviará as credenciais do usuário para esta URL. Este plugin verifica a resposta e interpreta o os códigos de status do HTTP 401 e 403 como credenciais inválidas, e todas as outras respostas como credenciais válidas."
 );
diff --git a/apps/user_webdavauth/l10n/sk_SK.php b/apps/user_webdavauth/l10n/sk_SK.php
index 589a82dc6f5..fa63b18569a 100644
--- a/apps/user_webdavauth/l10n/sk_SK.php
+++ b/apps/user_webdavauth/l10n/sk_SK.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV overenie",
+"URL: " => "URL: ",
 "ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud odošle používateľské údaje na zadanú URL. Plugin skontroluje odpoveď a považuje návratovú hodnotu HTTP 401 a 403 za neplatné údaje a všetky ostatné hodnoty ako platné prihlasovacie údaje."
 );
diff --git a/apps/user_webdavauth/user_webdavauth.php b/apps/user_webdavauth/user_webdavauth.php
index 146034a5d43..86e5b916f3d 100755
--- a/apps/user_webdavauth/user_webdavauth.php
+++ b/apps/user_webdavauth/user_webdavauth.php
@@ -56,10 +56,10 @@ class OC_USER_WEBDAVAUTH extends OC_User_Backend {
 		}
 		$returncode= substr($headers[0], 9, 3);
 
-		if(($returncode=='401') or ($returncode=='403')) {
-			return(false);
-		}else{
-			return($uid);
+		if(substr($returncode, 0, 1) === '2') {
+			return $uid;
+		} else {
+			return false;
 		}
 
 	}