+ |
+ t('directory'));
+ } else {
+ p($l->t('directories'));
+ }
+ }
+ if ($totaldirs !== 0 && $totalfiles !== 0) {
+ p(' & ');
+ }
+ if ($totalfiles !== 0) {
+ p($totalfiles.' ');
+ if ($totalfiles === 1) {
+ p($l->t('file'));
+ } else {
+ p($l->t('files'));
+ }
+ } ?>
+ |
+
+
+ |
+ |
+
+ t('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');
+ $errorMsg = $l->t('Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files.');
if(isset($_GET['p']) && $_GET['p'] === '1') {
header('HTTP/1.0 404 ' . $errorMsg);
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index e39e068cc5d..09153918940 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -543,4 +543,17 @@ class Hooks {
\OC_FileProxy::$enabled = $proxyStatus;
}
+
+ /**
+ * set migration status back to '0' so that all new files get encrypted
+ * if the app gets enabled again
+ * @param array $params contains the app ID
+ */
+ public static function preDisable($params) {
+ if ($params['app'] === 'files_encryption') {
+ $query = \OC_DB::prepare('UPDATE `*PREFIX*encryption` SET `migration_status`=0');
+ $query->execute();
+ }
+ }
+
}
diff --git a/apps/files_encryption/l10n/ca.php b/apps/files_encryption/l10n/ca.php
index 44836fb9c96..fd917f654ce 100644
--- a/apps/files_encryption/l10n/ca.php
+++ b/apps/files_encryption/l10n/ca.php
@@ -7,14 +7,20 @@
"Could not change the password. Maybe the old password was not correct." => "No s'ha pogut canviar la contrasenya. Potser la contrasenya anterior no era correcta.",
"Private key password successfully updated." => "La contrasenya de la clau privada s'ha actualitzat.",
"Could not update the private key password. Maybe the old password was not correct." => "No s'ha pogut actualitzar la contrasenya de la clau privada. Potser la contrasenya anterior no era correcta.",
-"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 clau privada no és vàlida! Potser la contrasenya ha canviat des de fora. Podeu actualitzar la contrasenya de la clau privada a l'arranjament personal per obtenir de nou accés als vostres fitxers",
+"PHP module OpenSSL is not installed." => "El mòdul OpenSSL de PHP no està instal·lat.",
+"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Demaneu a l'administrador del servidor que instal·li el mòdul. Per ara, l'aplicació d'encriptació s'ha deshabilitat.",
"Saving..." => "Desant...",
"Your private key is not valid! Maybe the your password was changed from outside." => "La vostra clau privada no és vàlida! Potser la vostra contrasenya ha canviat des de fora.",
"You can unlock your private key in your " => "Podeu desbloquejar la clau privada en el vostre",
"personal settings" => "arranjament personal",
"Encryption" => "Xifrat",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Activa la clau de recuperació (permet recuperar fitxers d'usuaris en cas de pèrdua de contrasenya):",
+"Recovery key password" => "Clau de recuperació de la contrasenya",
"Enabled" => "Activat",
"Disabled" => "Desactivat",
+"Change recovery key password:" => "Canvia la clau de recuperació de contrasenya:",
+"Old Recovery key password" => "Antiga clau de recuperació de contrasenya",
+"New Recovery key password" => "Nova clau de recuperació de contrasenya",
"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 88548b94306..a402b96a51b 100644
--- a/apps/files_encryption/l10n/cs_CZ.php
+++ b/apps/files_encryption/l10n/cs_CZ.php
@@ -7,7 +7,6 @@
"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ě.",
"Private key password successfully updated." => "Heslo soukromého klíče úspěšně aktualizováno.",
"Could not update the private key password. Maybe the old password was not correct." => "Nelze aktualizovat heslo soukromého klíče. Možná nebylo staré heslo správně.",
-"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í",
"Enabled" => "Povoleno",
diff --git a/apps/files_encryption/l10n/de_DE.php b/apps/files_encryption/l10n/de_DE.php
index 65cb3adebec..ff5ca1007fb 100644
--- a/apps/files_encryption/l10n/de_DE.php
+++ b/apps/files_encryption/l10n/de_DE.php
@@ -7,7 +7,6 @@
"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.",
-"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" => "Ihr privater Schlüssel ist ungültig. Möglicher Weise wurde von außerhalb Ihr Passwort geändert. Sie können das Passwort Ihres privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an Ihre Dateien zu gelangen.",
"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...",
diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php
index a88eccc0e41..e523a13bb67 100644
--- a/apps/files_encryption/l10n/es.php
+++ b/apps/files_encryption/l10n/es.php
@@ -7,7 +7,6 @@
"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...",
diff --git a/apps/files_encryption/l10n/es_AR.php b/apps/files_encryption/l10n/es_AR.php
index e7f28e1e1f6..82ea3e06a69 100644
--- a/apps/files_encryption/l10n/es_AR.php
+++ b/apps/files_encryption/l10n/es_AR.php
@@ -7,7 +7,6 @@
"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...",
diff --git a/apps/files_encryption/l10n/fr.php b/apps/files_encryption/l10n/fr.php
index 52a970d68bf..5942d840687 100644
--- a/apps/files_encryption/l10n/fr.php
+++ b/apps/files_encryption/l10n/fr.php
@@ -7,7 +7,7 @@
"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",
+"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Votre clé de sécurité privée n'est pas valide! Il est probable que votre mot de passe ait été changé sans passer par le système ownCloud (par éxemple: le serveur de votre entreprise). Ain d'avoir à nouveau accès à vos fichiers cryptés, vous pouvez mettre à jour votre clé de sécurité privée dans les paramètres personnels de votre compte.",
"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...",
diff --git a/apps/files_encryption/l10n/gl.php b/apps/files_encryption/l10n/gl.php
index e82840fa9a2..794b27b92db 100644
--- a/apps/files_encryption/l10n/gl.php
+++ b/apps/files_encryption/l10n/gl.php
@@ -7,7 +7,6 @@
"Could not change the password. Maybe the old password was not correct." => "Non foi posíbel cambiar o contrasinal. Probabelmente o contrasinal antigo non é o correcto.",
"Private key password successfully updated." => "A chave privada foi actualizada correctamente.",
"Could not update the private key password. Maybe the old password was not correct." => "Non foi posíbel actualizar o contrasinal da chave privada. É probábel que o contrasinal antigo non sexa correcto.",
-"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...",
diff --git a/apps/files_encryption/l10n/it.php b/apps/files_encryption/l10n/it.php
index f0f2c79cc4f..ba51eeb6d05 100644
--- a/apps/files_encryption/l10n/it.php
+++ b/apps/files_encryption/l10n/it.php
@@ -7,7 +7,6 @@
"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 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...",
diff --git a/apps/files_encryption/l10n/ja_JP.php b/apps/files_encryption/l10n/ja_JP.php
index b8e332672cf..ce1e3fd0f31 100644
--- a/apps/files_encryption/l10n/ja_JP.php
+++ b/apps/files_encryption/l10n/ja_JP.php
@@ -7,7 +7,7 @@
"Could not change the password. Maybe the old password was not correct." => "パスワードを変更できませんでした。古いパスワードが間違っているかもしれません。",
"Private key password successfully updated." => "秘密鍵のパスワードが正常に更新されました。",
"Could not update the private key password. Maybe the old password was not correct." => "秘密鍵のパスワードを更新できませんでした。古いパスワードが正確でない場合があります。",
-"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" => "秘密鍵が有効ではありません。パスワードが外部から変更された恐れがあります。。個人設定で秘密鍵のパスワードを更新して、ファイルへのアクセス権を奪還できます。",
+"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "秘密鍵が有効ではありません。パスワードがownCloudシステムの外部(例えば、企業ディレクトリ)から変更された恐れがあります。個人設定で秘密鍵のパスワードを更新して、暗号化されたファイルを回復出来ます。",
"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..." => "保存中...",
diff --git a/apps/files_encryption/l10n/nl.php b/apps/files_encryption/l10n/nl.php
index 56b4a9bfb38..cac25c8c80a 100644
--- a/apps/files_encryption/l10n/nl.php
+++ b/apps/files_encryption/l10n/nl.php
@@ -7,7 +7,6 @@
"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",
diff --git a/apps/files_encryption/l10n/pl.php b/apps/files_encryption/l10n/pl.php
index b9ad078a873..fce5abfcaf8 100644
--- a/apps/files_encryption/l10n/pl.php
+++ b/apps/files_encryption/l10n/pl.php
@@ -7,7 +7,6 @@
"Could not change the password. Maybe the old password was not correct." => "Nie można zmienić hasła. Może stare hasło nie było poprawne.",
"Private key password successfully updated." => "Pomyślnie zaktualizowano hasło klucza prywatnego.",
"Could not update the private key password. Maybe the old password was not correct." => "Nie można zmienić prywatnego hasła. Może stare hasło nie było poprawne.",
-"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...",
diff --git a/apps/files_encryption/l10n/pt_BR.php b/apps/files_encryption/l10n/pt_BR.php
index cb1678541bf..c8aa26188ad 100644
--- a/apps/files_encryption/l10n/pt_BR.php
+++ b/apps/files_encryption/l10n/pt_BR.php
@@ -7,7 +7,7 @@
"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.",
+"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Sua chave privada não é válida! Provavelmente sua senha foi alterada fora do sistema ownCloud (por exemplo, seu diretório corporativo). Você pode atualizar sua senha de chave privada em suas configurações pessoais para recuperar o acesso a seus arquivos criptografados.",
"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...",
diff --git a/apps/files_encryption/l10n/ru.php b/apps/files_encryption/l10n/ru.php
index f7b169525bb..38ee85ad878 100644
--- a/apps/files_encryption/l10n/ru.php
+++ b/apps/files_encryption/l10n/ru.php
@@ -7,7 +7,6 @@
"Could not change the password. Maybe the old password was not correct." => "Невозможно изменить пароль. Возможно старый пароль не был верен.",
"Private key password successfully updated." => "Пароль секретного ключа успешно обновлён.",
"Could not update the private key password. Maybe the old password was not correct." => "Невозможно обновить пароль от секретного ключа. Возможно, старый пароль указан неверно.",
-"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." => "Модуль OpenSSL для PHP не установлен.",
"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Попросите администратора сервера установить модуль. Приложение шифрования было временно отключено.",
"Saving..." => "Сохранение...",
diff --git a/apps/files_encryption/l10n/sk_SK.php b/apps/files_encryption/l10n/sk_SK.php
index b01c7f709d8..d8894e53706 100644
--- a/apps/files_encryption/l10n/sk_SK.php
+++ b/apps/files_encryption/l10n/sk_SK.php
@@ -7,7 +7,6 @@
"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",
diff --git a/apps/files_encryption/l10n/sl.php b/apps/files_encryption/l10n/sl.php
index d80613b4b12..aa6248fac29 100644
--- a/apps/files_encryption/l10n/sl.php
+++ b/apps/files_encryption/l10n/sl.php
@@ -1,14 +1,35 @@
"Ključ za obnovitev gesla je bil uspešno nastavljen",
+"Could not enable recovery key. Please check your recovery key password!" => "Ključa za obnovitev gesla ni bilo mogoče nastaviti. Preverite ključ!",
+"Recovery key successfully disabled" => "Ključ za obnovitev gesla je bil uspešno onemogočen",
+"Could not disable recovery key. Please check your recovery key password!" => "Ključa za obnovitev gesla ni bilo mogoče onemogočiti. Preverite ključ!",
"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.",
+"Private key password successfully updated." => "Zasebni ključ za geslo je bil uspešno posodobljen.",
+"Could not update the private key password. Maybe the old password was not correct." => "Zasebnega ključa za geslo ni bilo mogoče posodobiti. Morda vnos starega gesla ni bil pravilen.",
+"PHP module OpenSSL is not installed." => "PHP-modul OpenSSL ni nameščen.",
+"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Obvestite skrbnika strežnika, da namesti manjkajoč modul. Trenutno je šifriranje onemogočeno.",
"Saving..." => "Poteka shranjevanje ...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "Vaš zasebni ključ ni veljaven. Morda je bilo vaše geslo spremenjeno.",
+"You can unlock your private key in your " => "Svoj zasebni ključ lahko odklenite v",
"personal settings" => "osebne nastavitve",
"Encryption" => "Šifriranje",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Omogoči ključ za obnovitev datotek (v primeru izgube gesla)",
+"Recovery key password" => "Ključ za obnovitev gesla",
"Enabled" => "Omogočeno",
"Disabled" => "Onemogočeno",
+"Change recovery key password:" => "Spremeni ključ za obnovitev gesla:",
+"Old Recovery key password" => "Stari ključ za obnovitev gesla",
+"New Recovery key password" => "Nov ključ za obnovitev gesla",
"Change Password" => "Spremeni geslo",
+"Your private key password no longer match your log-in password:" => "Vaš zasebni ključ za geslo se ne ujema z vnešenim geslom ob prijavi:",
+"Set your old private key password to your current log-in password." => "Nastavite svoj star zasebni ključ v geslo, vnešeno ob prijavi.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Če ste svoje geslo pozabili, lahko vaše datoteke obnovi skrbnik sistema.",
"Old log-in password" => "Staro geslo",
"Current log-in password" => "Trenutno geslo",
+"Update Private Key Password" => "Posodobi zasebni ključ",
+"Enable password recovery:" => "Omogoči obnovitev gesla:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Nastavitev te možnosti omogoča ponovno pridobitev dostopa do šifriranih datotek, v primeru da boste geslo pozabili.",
"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 d3d317f2108..6f81db12004 100644
--- a/apps/files_encryption/l10n/sv.php
+++ b/apps/files_encryption/l10n/sv.php
@@ -7,7 +7,6 @@
"Could not change the password. Maybe the old password was not correct." => "Kunde inte ändra lösenordet. Kanske det gamla lösenordet inte var rätt.",
"Private key password successfully updated." => "Den privata lösenordsnyckeln uppdaterades utan problem.",
"Could not update the private key password. Maybe the old password was not correct." => "Kunde inte uppdatera den privata lösenordsnyckeln. Kanske var det gamla lösenordet fel.",
-"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" => "Din privata lösenordsnyckel är inte giltig! Kanske byttes ditt lösenord från utsidan. Du kan uppdatera din privata lösenordsnyckel under dina personliga inställningar för att återfå tillgång till dina filer",
"Saving..." => "Sparar...",
"Your private key is not valid! Maybe the your password was changed from outside." => "Din privata lösenordsnyckel är inte giltig! Kanske byttes ditt lösenord från utsidan.",
"You can unlock your private key in your " => "Du kan låsa upp din privata nyckel i dina",
diff --git a/apps/files_encryption/l10n/zh_CN.php b/apps/files_encryption/l10n/zh_CN.php
index 6d6d457f439..b4f98a2f7c0 100644
--- a/apps/files_encryption/l10n/zh_CN.php
+++ b/apps/files_encryption/l10n/zh_CN.php
@@ -5,11 +5,31 @@
"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." => "不能修改密码。旧密码可能不正确。",
+"Private key password successfully updated." => "私钥密码成功更新。",
+"Could not update the private key password. Maybe the old password was not correct." => "无法更新私钥密码。可能旧密码不正确。",
+"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 recovery key (allow to recover users files in case of password loss):" => "启用恢复密钥（允许你在密码丢失后恢复文件）：",
+"Recovery key password" => "恢复密钥密码",
"Enabled" => "开启",
"Disabled" => "禁用",
+"Change recovery key password:" => "更改恢复密钥密码",
+"Old Recovery key password" => "旧的恢复密钥密码",
+"New Recovery key password" => "新的恢复密钥密码",
"Change Password" => "修改密码",
+"Your private key password no longer match your log-in password:" => "您的私钥密码不再匹配您的登录密码：",
+"Set your old private key password to your current log-in password." => "讲您旧的私钥密码改为当前登录密码。",
+" If you don't remember your old password you can ask your administrator to recover your files." => "如果您记不住旧的密码，您可以请求管理员恢复您的文件。",
+"Old log-in password" => "旧登录密码",
+"Current log-in password" => "当前登录密码",
+"Update Private Key Password" => "更新私钥密码",
+"Enable password recovery:" => "启用密码恢复：",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "启用该项将允许你在密码丢失后取回您的加密文件",
"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 927064012b6..6543a0de5f3 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -57,10 +57,11 @@ class Crypt {
if ($res === false) {
\OCP\Util::writeLog('Encryption library', 'couldn\'t generate users key-pair for ' . \OCP\User::getUser(), \OCP\Util::ERROR);
+ \OCP\Util::writeLog('Encryption library', openssl_error_string(), \OCP\Util::ERROR);
} elseif (openssl_pkey_export($res, $privateKey)) {
// Get public key
- $publicKey = openssl_pkey_get_details($res);
- $publicKey = $publicKey['key'];
+ $keyDetails = openssl_pkey_get_details($res);
+ $publicKey = $keyDetails['key'];
$return = array(
'publicKey' => $publicKey,
@@ -68,6 +69,7 @@ class Crypt {
);
} else {
\OCP\Util::writeLog('Encryption library', 'couldn\'t export users private key, please check your servers openSSL configuration.' . \OCP\User::getUser(), \OCP\Util::ERROR);
+ \OCP\Util::writeLog('Encryption library', openssl_error_string(), \OCP\Util::ERROR);
}
return $return;
@@ -206,13 +208,10 @@ class Crypt {
public static function encrypt($plainContent, $iv, $passphrase = '') {
if ($encryptedContent = openssl_encrypt($plainContent, 'AES-128-CFB', $passphrase, false, $iv)) {
-
return $encryptedContent;
-
} else {
-
\OCP\Util::writeLog('Encryption library', 'Encryption (symmetric) of content failed', \OCP\Util::ERROR);
-
+ \OCP\Util::writeLog('Encryption library', openssl_error_string(), \OCP\Util::ERROR);
return false;
}
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index a22c139c503..0d30dd8e7b5 100755
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -62,6 +62,15 @@ class Helper {
\OCP\Util::connectHook('OC_Filesystem', 'post_rename', 'OCA\Encryption\Hooks', 'postRename');
}
+ /**
+ * @brief register app management related hooks
+ *
+ */
+ public static function registerAppHooks() {
+
+ \OCP\Util::connectHook('OC_App', 'pre_disable', 'OCA\Encryption\Hooks', 'preDisable');
+ }
+
/**
* @brief setup user for files_encryption
*
diff --git a/apps/files_external/l10n/te.php b/apps/files_external/l10n/te.php
index f557dda5592..3d31f6438f5 100644
--- a/apps/files_external/l10n/te.php
+++ b/apps/files_external/l10n/te.php
@@ -1,4 +1,5 @@
"సంచయం పేరు",
"Users" => "వాడుకరులు",
"Delete" => "తొలగించు"
);
diff --git a/apps/user_webdavauth/l10n/zh_CN.php b/apps/user_webdavauth/l10n/zh_CN.php
index 5a935f17125..ee4b88c6b49 100644
--- a/apps/user_webdavauth/l10n/zh_CN.php
+++ b/apps/user_webdavauth/l10n/zh_CN.php
@@ -1,4 +1,5 @@
"WebDAV 认证",
+"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。这个插件检查返回值并且将 HTTP 状态编码 401 和 403 解释为非法身份，其他所有返回值为合法身份。"
);
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index e66571fc75f..9b3b45fdf9d 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -62,6 +62,7 @@
"Share with link" => "Comparteix amb enllaç",
"Password protect" => "Protegir amb contrasenya",
"Password" => "Contrasenya",
+"Allow Public Upload" => "Permet pujada pública",
"Email link to person" => "Enllaç per correu electrónic amb la persona",
"Send" => "Envia",
"Set expiration date" => "Estableix la data de venciment",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index e7842eb1576..eca14f7d9a9 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -62,6 +62,7 @@
"Share with link" => "Über einen Link teilen",
"Password protect" => "Passwortschutz",
"Password" => "Passwort",
+"Allow Public Upload" => "Erlaube öffentliches hochladen",
"Email link to person" => "Link per E-Mail verschicken",
"Send" => "Senden",
"Set expiration date" => "Ein Ablaufdatum setzen",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 2d1181bfec4..079cde5c30c 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -62,6 +62,7 @@
"Share with link" => "Partager via lien",
"Password protect" => "Protéger par un mot de passe",
"Password" => "Mot de passe",
+"Allow Public Upload" => "Autoriser l'upload par les utilisateurs non enregistrés",
"Email link to person" => "Envoyez le lien par email",
"Send" => "Envoyer",
"Set expiration date" => "Spécifier la date d'expiration",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index f14e4fbb313..c6cca9ddfe0 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -62,6 +62,7 @@
"Share with link" => "Condividi con collegamento",
"Password protect" => "Proteggi con password",
"Password" => "Password",
+"Allow Public Upload" => "Permetti Upload Pubblico",
"Email link to person" => "Invia collegamento via email",
"Send" => "Invia",
"Set expiration date" => "Imposta data di scadenza",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index b1c8b9a438e..ccd5e46425c 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -62,6 +62,7 @@
"Share with link" => "URLリンクで共有",
"Password protect" => "パスワード保護",
"Password" => "パスワード",
+"Allow Public Upload" => "パブリックなアップロードを許可",
"Email link to person" => "メールリンク",
"Send" => "送信",
"Set expiration date" => "有効期限を設定",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 4d05e4fcd54..98a2c6b0af2 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -62,6 +62,7 @@
"Share with link" => "Współdziel wraz z odnośnikiem",
"Password protect" => "Zabezpiecz hasłem",
"Password" => "Hasło",
+"Allow Public Upload" => "Pozwól na publiczne wczytywanie",
"Email link to person" => "Wyślij osobie odnośnik poprzez e-mail",
"Send" => "Wyślij",
"Set expiration date" => "Ustaw datę wygaśnięcia",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index f57c0a29291..69a87133ff2 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -62,6 +62,7 @@
"Share with link" => "Compartilhar com link",
"Password protect" => "Proteger com senha",
"Password" => "Senha",
+"Allow Public Upload" => "Permitir upload público",
"Email link to person" => "Enviar link por e-mail",
"Send" => "Enviar",
"Set expiration date" => "Definir data de expiração",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index 81440044adb..bbe7554245d 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -62,6 +62,7 @@
"Share with link" => "Omogoči souporabo preko povezave",
"Password protect" => "Zaščiti z geslom",
"Password" => "Geslo",
+"Allow Public Upload" => "Dovoli javne prenose na strežnik",
"Email link to person" => "Posreduj povezavo po elektronski pošti",
"Send" => "Pošlji",
"Set expiration date" => "Nastavi datum preteka",
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 29fef5ff220..80815b508ce 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -1,4 +1,5 @@
"%s 向您分享了 »%s«",
"Category type not provided." => "未提供分类类型。",
"No category to add?" => "没有可添加分类？",
"This category already exists: %s" => "此分类已存在：%s",
@@ -55,12 +56,13 @@
"Error while sharing" => "共享时出错",
"Error while unsharing" => "取消共享时出错",
"Error while changing permissions" => "修改权限时出错",
-"Shared with you and the group {group} by {owner}" => "{owner}共享给您及{group}组",
-"Shared with you by {owner}" => " {owner}与您共享",
+"Shared with you and the group {group} by {owner}" => "{owner} 共享给您及 {group} 组",
+"Shared with you by {owner}" => "{owner} 与您共享",
"Share with" => "分享之",
"Share with link" => "共享链接",
"Password protect" => "密码保护",
"Password" => "密码",
+"Allow Public Upload" => "允许公开上传",
"Email link to person" => "发送链接到个人",
"Send" => "发送",
"Set expiration date" => "设置过期日期",
@@ -68,7 +70,7 @@
"Share via email:" => "通过Email共享",
"No people found" => "未找到此人",
"Resharing is not allowed" => "不允许二次共享",
-"Shared in {item} with {user}" => "在{item} 与 {user}共享。",
+"Shared in {item} with {user}" => "在 {item} 与 {user} 共享。",
"Unshare" => "取消共享",
"can edit" => "可以修改",
"access control" => "访问控制",
@@ -89,6 +91,8 @@
"Request failed!