18 files changed, 219 insertions, 12 deletions
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index c9e3de56916..6e68d81ba00 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -25,6 +25,12 @@ stream_wrapper_register('crypt', 'OCA\Encryption\Stream');
 
 // check if we are logged in
 if (OCP\User::isLoggedIn()) {
+
+	// ensure filesystem is loaded
+	if(!\OC\Files\Filesystem::$loaded) {
+		\OC_Util::setupFS();
+	}
+
 	$view = new OC_FilesystemView('/');
 	$session = new \OCA\Encryption\Session($view);
 
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index cfe9e9d2a32..4434df8f147 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -46,6 +46,11 @@ class Hooks {
 
 		$view = new \OC_FilesystemView('/');
 
+		// ensure filesystem is loaded
+		if(!\OC\Files\Filesystem::$loaded) {
+			\OC_Util::setupFS($params['uid']);
+		}
+
 		$util = new Util($view, $params['uid']);
 
 		// setup user, if user not ready force relogin
@@ -142,6 +147,15 @@ class Hooks {
 	}
 
 	/**
+	 * @brief If the password can't be changed within ownCloud, than update the key password in advance.
+	 */
+	public static function preSetPassphrase($params) {
+		if ( ! \OC_User::canUserChangePassword($params['uid']) ) {
+			self::setPassphrase($params);
+		}
+	}
+
+	/**
 	 * @brief Change a user's encryption passphrase
 	 * @param array $params keys: uid, password
 	 */
diff --git a/apps/files_encryption/l10n/ca.php b/apps/files_encryption/l10n/ca.php
index 46e91d1f070..5db1d7e58c5 100644
--- a/apps/files_encryption/l10n/ca.php
+++ b/apps/files_encryption/l10n/ca.php
@@ -1,4 +1,22 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "La clau de recuperació s'ha activat",
+"Could not enable recovery key. Please check your recovery key password!" => "No s'ha pogut activar la clau de recuperació. Comproveu contrasenya de la clau de recuperació!",
+"Recovery key successfully disabled" => "La clau de recuperació s'ha descativat",
+"Could not disable recovery key. Please check your recovery key password!" => "No s'ha pogut desactivar la calu de recuperació. Comproveu la contrasenya de la clau de recuperació!",
+"Password successfully changed." => "La contrasenya s'ha canviat.",
+"Could not change the password. Maybe the old password was not correct." => "No s'ha pogut canviar la contrasenya. Potser la contrasenya anterior no era correcta.",
 "Saving..." => "Desant...",
-"Encryption" => "Xifrat"
+"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",
+"Enable password recovery by sharing all files with your administrator:" => "Activa la recuperació de contrasenya compartint tots els fitxers amb l'administrador:",
+"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Activant aquesta opció us permetrà obtenir de nou accés als fitxers encriptats si perdeu la contrasenya",
+"File recovery settings updated" => "S'han  actualitzat els arranjaments de recuperació de fitxers",
+"Could not update file recovery" => "No s'ha pogut actualitzar la recuperació de fitxers"
 );
diff --git a/apps/files_encryption/l10n/cs_CZ.php b/apps/files_encryption/l10n/cs_CZ.php
index f9b2dd06b6f..e8c365972ca 100644
--- a/apps/files_encryption/l10n/cs_CZ.php
+++ b/apps/files_encryption/l10n/cs_CZ.php
@@ -1,4 +1,22 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Záchranný klíč byl úspěšně povolen",
+"Could not enable recovery key. Please check your recovery key password!" => "Nepodařilo se povolit záchranný klíč. Zkontrolujte prosím vaše heslo záchranného klíče!",
+"Recovery key successfully disabled" => "Záchranný klíč byl úspěšně zakázán",
+"Could not disable recovery key. Please check your recovery key password!" => "Nelze zakázat záchranný klíč. Zkontrolujte prosím heslo vašeho záchranného klíče.",
+"Password successfully changed." => "Heslo bylo úspěšně změněno.",
+"Could not change the password. Maybe the old password was not correct." => "Nelze změnit heslo. Pravděpodobně nebylo stávající heslo zadáno správně.",
 "Saving..." => "Ukládám...",
-"Encryption" => "Šifrování"
+"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 by sharing all files with your administrator:" => "Povolit obnovu hesla sdílením všech souborů s vaším správcem:",
+"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Povolení vám umožní znovu získat přístup k vašim zašifrovaným souborům pokud ztratíte heslo",
+"File recovery settings updated" => "Možnosti obnovy souborů aktualizovány",
+"Could not update file recovery" => "Nelze aktualizovat obnovu souborů"
 );
diff --git a/apps/files_encryption/l10n/de.php b/apps/files_encryption/l10n/de.php
index 2ab77f480cf..18fe7df6487 100644
--- a/apps/files_encryption/l10n/de.php
+++ b/apps/files_encryption/l10n/de.php
@@ -1,4 +1,17 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Wiederherstellungsschlüssel wurde erfolgreich aktiviert",
+"Could not enable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Überprüfen Sie Ihr Wiederherstellungspasswort!",
+"Recovery key successfully disabled" => "Wiederherstellungsschlüssel deaktiviert.",
+"Could not disable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Überprüfen Sie Ihr Wiederherstellungspasswort!",
+"Password successfully changed." => "Dein Passwort wurde geändert.",
+"Could not change the password. Maybe the old password was not correct." => "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort falsch.",
 "Saving..." => "Speichern...",
-"Encryption" => "Verschlüsselung"
+"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",
+"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Wenn Sie diese Einstellung aktivieren, können Sie auch im Falle des Verlustes Ihres Passworts auf verschlüsselte Dateien zugreifen",
+"File recovery settings updated" => "Einstellungen zur Wiederherstellung von Dateien wurden aktualisiert"
 );
diff --git a/apps/files_encryption/l10n/de_DE.php b/apps/files_encryption/l10n/de_DE.php
index 5ab283ccab3..48bf3a89a24 100644
--- a/apps/files_encryption/l10n/de_DE.php
+++ b/apps/files_encryption/l10n/de_DE.php
@@ -1,9 +1,20 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Der Wiederherstellungsschlüssel wurde erfolgreich aktiviert.",
+"Could not enable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
+"Recovery key successfully disabled" => "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert.",
+"Could not disable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
 "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.",
 "Saving..." => "Speichern...",
 "Encryption" => "Verschlüsselung",
+"Recovery account password" => "Account-Passwort wiederherstellen",
 "Enabled" => "Aktiviert",
 "Disabled" => "Deaktiviert",
-"Change Password" => "Passwort ändern"
+"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",
+"Enable password recovery by sharing all files with your administrator:" => "Aktiviere die Wiederherstellung deines Passwortes durch das Teilen aller Dateien mit dem Administrator:",
+"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben.",
+"File recovery settings updated" => "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert.",
+"Could not update file recovery" => "Die Dateiwiederherstellung konnte nicht aktualisiert werden."
 );
diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php
index 7311a78f09b..58adbd716a8 100644
--- a/apps/files_encryption/l10n/es.php
+++ b/apps/files_encryption/l10n/es.php
@@ -1,4 +1,22 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Se ha habilitado la recuperación de archivos",
+"Could not enable recovery key. Please check your recovery key password!" => "No se pudo habilitar la clave de recuperación. Por favor compruebe su contraseña.",
+"Recovery key successfully disabled" => "Clave de recuperación deshabilitada",
+"Could not disable recovery key. Please check your recovery key password!" => "No se pudo deshabilitar la clave de recuperación. Por favor compruebe su contraseña!",
+"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.",
 "Saving..." => "Guardando...",
-"Encryption" => "Cifrado"
+"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",
+"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 Password" => "Cambiar contraseña",
+"Enable password recovery by sharing all files with your administrator:" => "Habilitar recuperación de contraseña compartiendo todos los archivos con su administrador",
+"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Habilitar esta opción para poder acceder a sus archivos cifrados si pierde su 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/fr.php b/apps/files_encryption/l10n/fr.php
index 98fb70691df..af4fd1a893f 100644
--- a/apps/files_encryption/l10n/fr.php
+++ b/apps/files_encryption/l10n/fr.php
@@ -1,4 +1,22 @@
 <?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!",
+"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.",
 "Saving..." => "Enregistrement...",
-"Encryption" => "Chiffrement"
+"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 ",
+"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 Password" => "Changer de mot de passe",
+"Enable password recovery by sharing all files with your administrator:" => "Activer la récupération des mots de passe en partageant les fichiers avec votre administrateur:",
+"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "En activant cette option cela vous autorisera à récupérer votre accès aux fichiers cryptés si votre mot de passe est perdu",
+"File recovery settings updated" => "Mise à jour des paramètres de récupération de fichiers ",
+"Could not update file recovery" => "Ne peut pas remettre à jour les fichiers de récupération"
 );
diff --git a/apps/files_encryption/l10n/ja_JP.php b/apps/files_encryption/l10n/ja_JP.php
index 7f906ae5c03..6d2d3e249c0 100644
--- a/apps/files_encryption/l10n/ja_JP.php
+++ b/apps/files_encryption/l10n/ja_JP.php
@@ -1,4 +1,8 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "リカバリ用のキーは正常に有効化されました",
+"Could not enable recovery key. Please check your recovery key password!" => "リカバリ用のキーを有効にできませんでした。リカバリ用のキーのパスワードを確認して下さい！",
+"Recovery key successfully disabled" => "リカバリ用のキーを正常に無効化しました",
+"Could not disable recovery key. Please check your recovery key password!" => "リカバリ用のキーを無効化できませんでした。リカバリ用のキーのパスワードを確認して下さい！",
 "Password successfully changed." => "パスワードを変更できました。",
 "Could not change the password. Maybe the old password was not correct." => "パスワードを変更できませんでした。古いパスワードが間違っているかもしれません。",
 "Saving..." => "保存中...",
diff --git a/apps/files_encryption/l10n/lt_LT.php b/apps/files_encryption/l10n/lt_LT.php
index 6bc80ff44ab..8e9d02c3b13 100644
--- a/apps/files_encryption/l10n/lt_LT.php
+++ b/apps/files_encryption/l10n/lt_LT.php
@@ -1,4 +1,22 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Atkūrimo raktas sėkmingai įjungtas",
+"Could not enable recovery key. Please check your recovery key password!" => "Neišėjo įjungti jūsų atkūrimo rakto. Prašome jį patikrinti!",
+"Recovery key successfully disabled" => "Atkūrimo raktas sėkmingai išjungtas",
+"Could not disable recovery key. Please check your recovery key password!" => "Neišėjo išjungti jūsų atkūrimo rakto. Prašome jį patikrinti!",
+"Password successfully changed." => "Slaptažodis sėkmingai pakeistas",
+"Could not change the password. Maybe the old password was not correct." => "Slaptažodis nebuvo pakeistas. Gali būti, kad buvo neteisingai suvestas senasis.",
 "Saving..." => "Saugoma...",
-"Encryption" => "Šifravimas"
+"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į",
+"Enable password recovery by sharing all files with your administrator:" => "Įjungti slaptažodžio atkūrimą dalinantis visais failas su administratoriumi:",
+"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Įjungus šią funkciją jums bus suteiktas priėjimas prie šifruotos informacijos ir pamiršus 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 ebcbdfab15f..9c462917cf3 100644
--- a/apps/files_encryption/l10n/nl.php
+++ b/apps/files_encryption/l10n/nl.php
@@ -1,4 +1,8 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Herstelsleutel succesvol geactiveerd",
+"Could not enable recovery key. Please check your recovery key password!" => "Kon herstelsleutel niet activeren. Controleer het wachtwoord van uw herstelsleutel!",
+"Recovery key successfully disabled" => "Herstelsleutel succesvol gedeactiveerd",
+"Could not disable recovery key. Please check your recovery key password!" => "Kon herstelsleutel niet deactiveren. Controleer het wachtwoord van uw herstelsleutel!",
 "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.",
 "Saving..." => "Opslaan",
diff --git a/apps/files_encryption/l10n/pt_BR.php b/apps/files_encryption/l10n/pt_BR.php
index ce8814c233e..e5fa0b55cad 100644
--- a/apps/files_encryption/l10n/pt_BR.php
+++ b/apps/files_encryption/l10n/pt_BR.php
@@ -1,4 +1,8 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Recuperação de chave habilitada com sucesso",
+"Could not enable recovery key. Please check your recovery key password!" => "Impossível habilitar recuperação de chave. Por favor verifique sua senha para recuperação de chave!",
+"Recovery key successfully disabled" => "Recuperação de chave desabilitada com sucesso",
+"Could not disable recovery key. Please check your recovery key password!" => "Impossível desabilitar recuperação de chave. Por favor verifique sua senha para recuperação de chave!",
 "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.",
 "Saving..." => "Salvando...",
diff --git a/apps/files_encryption/l10n/sv.php b/apps/files_encryption/l10n/sv.php
index 966963b5549..efcfc105073 100644
--- a/apps/files_encryption/l10n/sv.php
+++ b/apps/files_encryption/l10n/sv.php
@@ -1,4 +1,22 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Återställningsnyckeln har framgångsrikt aktiverats",
+"Could not enable recovery key. Please check your recovery key password!" => "Kunde inte aktivera återställningsnyckeln. Vänligen kontrollera ditt lösenord för återställningsnyckeln!",
+"Recovery key successfully disabled" => "Återställningsnyckeln har framgångsrikt inaktiverats",
+"Could not disable recovery key. Please check your recovery key password!" => "Kunde inte inaktivera återställningsnyckeln. Vänligen kontrollera ditt lösenord för återställningsnyckeln!",
+"Password successfully changed." => "Ändringen av lösenordet lyckades.",
+"Could not change the password. Maybe the old password was not correct." => "Kunde inte ändra lösenordet. Kanske det gamla lösenordet inte var rätt.",
 "Saving..." => "Sparar...",
-"Encryption" => "Kryptering"
+"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",
+"Enable password recovery by sharing all files with your administrator:" => "Aktivera lösenordsåterställning genom att dela alla filer med din administratör:",
+"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Aktivera det här alternativet för att 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 917ff0a0eae..fc0847ed85d 100644
--- a/apps/files_encryption/l10n/tr.php
+++ b/apps/files_encryption/l10n/tr.php
@@ -1,4 +1,22 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Kurtarma anahtarı başarıyla etkinleştirildi",
+"Could not enable recovery key. Please check your recovery key password!" => "Kurtarma anahtarı etkinleştirilemedi. Lütfen kurtarma anahtarı parolanızı kontrol edin!",
+"Recovery key successfully disabled" => "Kurtarma anahtarı başarıyla devre dışı bırakıldı",
+"Could not disable recovery key. Please check your recovery key password!" => "Kurtarma anahtarı devre dışı bırakılamadı. Lütfen kurtarma anahtarı parolanızı kontrol edin!",
+"Password successfully changed." => "Şifreniz başarıyla değiştirildi.",
+"Could not change the password. Maybe the old password was not correct." => "Parola değiştirilemedi. Eski parolanız doğru olmayabilir",
 "Saving..." => "Kaydediliyor...",
-"Encryption" => "Şifreleme"
+"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",
+"Enable password recovery by sharing all files with your administrator:" => "Parola kurtarmasını tüm paylaşılan dosyaları sistem yöneticiniz ile paylaşarak kurtarmayı etkinleştir:",
+"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Bu seçeneği etkinleştirmekle eğer parolanızı kaybederseniz şifreli dosyalara erişimi elde etmiş olursunuz",
+"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 0af5bdc9a67..3e76060b1de 100644
--- a/apps/files_encryption/l10n/vi.php
+++ b/apps/files_encryption/l10n/vi.php
@@ -1,4 +1,10 @@
 <?php $TRANSLATIONS = array(
+"Password successfully changed." => "Đã đổi mật khẩu.",
+"Could not change the password. Maybe the old password was not correct." => "Không thể đổi mật khẩu. Có lẽ do mật khẩu cũ không đúng.",
 "Saving..." => "Đang lưu...",
-"Encryption" => "Mã hóa"
+"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 e565fce801c..59582e6fd52 100644
--- a/apps/files_encryption/l10n/zh_CN.php
+++ b/apps/files_encryption/l10n/zh_CN.php
@@ -1,4 +1,22 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "恢复密钥成功启用",
+"Could not enable recovery key. Please check your recovery key password!" => "不能启用恢复密钥。请检查恢复密钥密码！",
+"Recovery key successfully disabled" => "恢复密钥成功禁用",
+"Could not disable recovery key. Please check your recovery key password!" => "不能禁用恢复密钥。请检查恢复密钥密码！",
+"Password successfully changed." => "密码修改成功。",
+"Could not change the password. Maybe the old password was not correct." => "不能修改密码。旧密码可能不正确。",
 "Saving..." => "保存中",
-"Encryption" => "加密"
+"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" => "修改密码",
+"Enable password recovery by sharing all files with your administrator:" => "通过与系统管理员共享全部文件启用密码恢复：",
+"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "启用该选项将允许你丢失密码时重新取得加密过的文件。",
+"File recovery settings updated" => "文件恢复设置已更新",
+"Could not update file recovery" => "不能更新文件恢复"
 );
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index 923cc2ce9dc..a22c139c503 100755
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -48,6 +48,7 @@ class Helper {
 
 		\OCP\Util::connectHook('OC_User', 'post_login', 'OCA\Encryption\Hooks', 'login');
 		\OCP\Util::connectHook('OC_User', 'post_setPassword', 'OCA\Encryption\Hooks', 'setPassphrase');
+		\OCP\Util::connectHook('OC_User', 'pre_setPassword', 'OCA\Encryption\Hooks', 'preSetPassphrase');
 		\OCP\Util::connectHook('OC_User', 'post_createUser', 'OCA\Encryption\Hooks', 'postCreateUser');
 		\OCP\Util::connectHook('OC_User', 'post_deleteUser', 'OCA\Encryption\Hooks', 'postDeleteUser');
 	}
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index 9a0d542c6d5..ae006c17940 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -533,7 +533,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 		// some hacking to simulate public link
 		$GLOBALS['app'] = 'files_sharing';
 		$GLOBALS['fileOwner'] = \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1;
-		\OC_User::setUserId('');
+		\OC_User::setUserId(false);
 
 		// get file contents
 		$retrievedCryptedFile = file_get_contents('crypt://' . $this->filename);