6 files changed, 56 insertions, 9 deletions
diff --git a/apps/files_encryption/l10n/bg_BG.php b/apps/files_encryption/l10n/bg_BG.php
index 89e396565d0..b44601aec2e 100644
--- a/apps/files_encryption/l10n/bg_BG.php
+++ b/apps/files_encryption/l10n/bg_BG.php
@@ -1,12 +1,43 @@
 <?php
 $TRANSLATIONS = array(
-"Password successfully changed." => "Паролата е сменена успешно.",
-"Could not change the password. Maybe the old password was not correct." => "Грешка при смяна на паролата. Може би старата ви парола е сгрешена.",
+"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." => "Грешка при промяна на паролата. Може би старата ти парола е сгрешена.",
+"Private key password successfully updated." => "Успешно променена тайната парола за ключа.",
+"Could not update the private key password. Maybe the old password was not correct." => "Неуспешна промяна на тайната парола за ключа. Може би старата парола е грешно въведена.",
+"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Неуспешна инициализация на криптиращото приложение! Може би криптиращото приложение бе включено по време на твоята сесия. Отпиши се и се впиши обратно за да инциализираш криптиращото приложение.",
+"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Твоят таен ключ е невалиден! Вероятно твоята парола беше променена извън %s(пр. твоята корпоративна директория). Можеш да промениш своят таен ключ в Лични настройки, за да възстановиш достъпа до криптираните файлове.",
+"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Неуспешно разшифроване на този файл, вероятно това е споделен файл. Моля, поискай собственика на файла да го сподели повторно с теб.",
+"Unknown error. Please check your system settings or contact your administrator" => "Непозната грешка. Моля, провери системните настройки или се свържи с администратора.",
+"Missing requirements." => "Липсва задължителна информация.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Моля, увери се, че PHP 5.3.3 или по-нова версия е инсталирана, и че OpenSSL заедно съответната PHP добавка са включени и правилно настроени. За сега, криптиращото приложение ще бъде изключено.",
+"Following users are not set up for encryption:" => "Следните потребители не са настроени за криптиране:",
+"Initial encryption started... This can take some time. Please wait." => "Първоначалното криптиране започна... Това може да отнеме време. Моля изчакай.",
+"Initial encryption running... Please try again later." => "Тече първоначално криптиране... Моля опитай по-късно.",
+"Go directly to your %spersonal settings%s." => "Отиде направо към твоите %sлични настройки%s.",
 "Encryption" => "Криптиране",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Включи опцията възстановяване на ключ (разрешава да възстанови файловете на потребителите в случай на загубена парола):",
+"Recovery key password" => "Парола за възстановяане на ключа",
+"Repeat Recovery key password" => "Повтори паролата за възстановяване на ключа",
 "Enabled" => "Включено",
 "Disabled" => "Изключено",
-"Change Password" => "Промяна на парола",
-"Old log-in password" => "Стара парола",
-"Current log-in password" => "Текуща парола"
+"Change recovery key password:" => "Промени паролата за въстановяване на ключа:",
+"Old Recovery key password" => "Старата парола за въстановяване на ключа",
+"New Recovery key password" => "Новата парола за възстановяване на ключа",
+"Repeat 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" => "Неуспешна промяна на настройките за възстановяване на файлове."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/zh_CN.php b/apps/files_encryption/l10n/zh_CN.php
index 5ead5176349..4454c458f0e 100644
--- a/apps/files_encryption/l10n/zh_CN.php
+++ b/apps/files_encryption/l10n/zh_CN.php
@@ -9,12 +9,15 @@ $TRANSLATIONS = array(
 "Private key password successfully updated." => "私钥密码成功更新。",
 "Could not update the private key password. Maybe the old password was not correct." => "无法更新私钥密码。可能旧密码不正确。",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "加密应用还没有初始化！可能加密应用在你会话期间已被重新启用。请注销并重新登录，以初始化加密应用。",
+"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "您的私有密钥无效！也许是您在 %s 外更改了密码 (比如，在您的公司目录)。您可以在个人设置里更新您的私钥密码来恢复访问你的加密文件。",
+"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => " 无法解密这个文件（或许这是一个共享文件？），请询问文件所有者重新与您分享这个文件。",
 "Unknown error. Please check your system settings or contact your administrator" => "未知错误。请检查系统设置或联系您的管理员",
 "Missing requirements." => "必填项未填写。",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "请确认安装了 PHP 5.3.3 或更新版本，且 OpenSSL 及其 PHP 扩展已经启用并正确配置。加密应用现在已被禁用。",
 "Following users are not set up for encryption:" => "以下用户还没有设置加密：",
 "Initial encryption started... This can take some time. Please wait." => "初始加密启动中....这可能会花一些时间，请稍后再试。",
 "Initial encryption running... Please try again later." => "初始加密运行中....请稍后再试。",
+"Go directly to your %spersonal settings%s." => "直接访问您的%s个人设置%s。",
 "Encryption" => "加密",
 "Enable recovery key (allow to recover users files in case of password loss):" => "启用恢复密钥（允许你在密码丢失后恢复文件）：",
 "Recovery key password" => "恢复密钥密码",
diff --git a/apps/files_encryption/l10n/zh_HK.php b/apps/files_encryption/l10n/zh_HK.php
index edbeb0f1c66..c9480c429f5 100644
--- a/apps/files_encryption/l10n/zh_HK.php
+++ b/apps/files_encryption/l10n/zh_HK.php
@@ -1,5 +1,8 @@
 <?php
 $TRANSLATIONS = array(
-"Encryption" => "加密"
+"Encryption" => "加密",
+"Enabled" => "啟用",
+"Disabled" => "停用",
+"Change Password" => "更改密碼"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/settings-admin.php b/apps/files_encryption/settings-admin.php
index 88e06613997..496a7cffb50 100644
--- a/apps/files_encryption/settings-admin.php
+++ b/apps/files_encryption/settings-admin.php
@@ -12,8 +12,11 @@ $tmpl = new OCP\Template('files_encryption', 'settings-admin');
 
 // Check if an adminRecovery account is enabled for recovering files after lost pwd
 $recoveryAdminEnabled = \OC::$server->getAppConfig()->getValue('files_encryption', 'recoveryAdminEnabled', '0');
+$session = new \OCA\Encryption\Session(new \OC\Files\View('/'));
+$initStatus = $session->getInitialized();
 
 $tmpl->assign('recoveryEnabled', $recoveryAdminEnabled);
+$tmpl->assign('initStatus', $initStatus);
 
 \OCP\Util::addscript('files_encryption', 'settings-admin');
 \OCP\Util::addscript('core', 'multiselect');
diff --git a/apps/files_encryption/templates/settings-admin.php b/apps/files_encryption/templates/settings-admin.php
index d4e6abf004a..a97261dc1c9 100644
--- a/apps/files_encryption/templates/settings-admin.php
+++ b/apps/files_encryption/templates/settings-admin.php
@@ -1,6 +1,9 @@
 <form id="encryption" class="section">
 	<h2><?php p($l->t('Encryption')); ?></h2>
 
+	<?php if($_["initStatus"] === \OCA\Encryption\Session::NOT_INITIALIZED): ?>
+		<?php p($l->t("Encryption App is enabled but your keys are not initialized, please log-out and log-in again")); ?>
+	<?php else: ?>
 	<p>
 		<?php p($l->t("Enable recovery key (allow to recover users files in case of password loss):")); ?>
 		<br/>
@@ -57,4 +60,5 @@
 		</button>
 		<span class="msg"></span>
 	</p>
+	<?php endif; ?>
 </form>
diff --git a/apps/files_encryption/templates/settings-personal.php b/apps/files_encryption/templates/settings-personal.php
index e9988df3275..3d44b9fa9a5 100644
--- a/apps/files_encryption/templates/settings-personal.php
+++ b/apps/files_encryption/templates/settings-personal.php
@@ -1,7 +1,11 @@
 <form id="encryption" class="section">
 	<h2><?php p( $l->t( 'Encryption' ) ); ?></h2>
 
-	<?php if ( $_["initialized"] === '1' ): ?>
+	<?php if ( $_["initialized"] === \OCA\Encryption\Session::NOT_INITIALIZED ): ?>
+
+	<?php p($l->t("Encryption App is enabled but your keys are not initialized, please log-out and log-in again")); ?>
+
+	<?php elseif ( $_["initialized"] === \OCA\Encryption\Session::INIT_EXECUTED ): ?>
 		<p>
 			<a name="changePKPasswd" />
 			<label for="changePrivateKeyPasswd">
@@ -33,9 +37,8 @@
 			</button>
 			<span class="msg"></span>
 		</p>
-	<?php endif; ?>
 
-	<?php if ( $_["recoveryEnabled"] && $_["privateKeySet"] ): ?>
+	<?php elseif ( $_["recoveryEnabled"] && $_["privateKeySet"] &&  $_["initialized"] === \OCA\Encryption\Session::INIT_SUCCESSFUL ): ?>
 		<br />
 		<p>
 			<label for="userEnableRecovery"><?php p( $l->t( "Enable password recovery:" ) ); ?></label>