diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2016-06-21 11:18:22 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2016-06-21 11:18:22 +0200 |
| commit | 2b493e2f9dca674ba11f88a1d182d6872e04eaaa (patch) | |
| tree | ef7fa75d1b4da812de80e93c3590dbb5404d7f06 /apps/encryption | |
| parent | b4df57f3f02f65ed71d1072280751170379a53e8 (diff) | |
| parent | 0e575c7eeadc6c8eb11b0be2ed1d39cdcf6cfcb8 (diff) | |
| download | nextcloud-server-2b493e2f9dca674ba11f88a1d182d6872e04eaaa.tar.gz nextcloud-server-2b493e2f9dca674ba11f88a1d182d6872e04eaaa.zip | |
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
Diffstat (limited to 'apps/encryption')
| -rw-r--r-- | apps/encryption/l10n/zh_CN.js | 1 | ||||
| -rw-r--r-- | apps/encryption/l10n/zh_CN.json | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/apps/encryption/l10n/zh_CN.js b/apps/encryption/l10n/zh_CN.js index 93a1b13996a..e2f9212c8cf 100644 --- a/apps/encryption/l10n/zh_CN.js +++ b/apps/encryption/l10n/zh_CN.js @@ -15,6 +15,7 @@ OC.L10N.register( "Could not change the password. Maybe the old password was not correct." : "不能修改密码。旧密码可能不正确。", "Could not update the private key password." : "不能更新私有密钥。", "The old password was not correct, please try again." : "原始密码错误，请重试。", + "The current log-in password was not correct, please try again." : "当前登录密码不正确，请重试。", "Private key password successfully updated." : "私钥密码成功更新。", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "无效的私有密钥。请到您的个人配置里去更新私有密钥，来恢复对加密文件的访问。", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "加密应用被启用了，但是你的加密密钥没有初始化，请重新登出登录系统一次。", diff --git a/apps/encryption/l10n/zh_CN.json b/apps/encryption/l10n/zh_CN.json index 0fb653b232c..8ac6c9eef01 100644 --- a/apps/encryption/l10n/zh_CN.json +++ b/apps/encryption/l10n/zh_CN.json @@ -13,6 +13,7 @@ "Could not change the password. Maybe the old password was not correct." : "不能修改密码。旧密码可能不正确。", "Could not update the private key password." : "不能更新私有密钥。", "The old password was not correct, please try again." : "原始密码错误，请重试。", + "The current log-in password was not correct, please try again." : "当前登录密码不正确，请重试。", "Private key password successfully updated." : "私钥密码成功更新。", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "无效的私有密钥。请到您的个人配置里去更新私有密钥，来恢复对加密文件的访问。", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "加密应用被启用了，但是你的加密密钥没有初始化，请重新登出登录系统一次。", |