diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-11-20 15:36:09 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-11-20 15:36:09 +0100 |
commit | ff67385cfbfd6f5403b2f8b58407dc730dc7e694 (patch) | |
tree | a8a0df2129a863a739dda6399352d64af811110e /config/locales/devise.zh-CN.yml | |
parent | 707c4918b21d19dd53b64120dbc7263f45fc5ecd (diff) | |
parent | 8dfc45f757ed8995be0d16e88a1f1d6514dae677 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - README.md discarded upstream changes - app/controllers/api/v1/bookmarks_controller.rb finally merged upstream, some code style fixes and slightly changed pagination code - app/controllers/application_controller.rb changed upstream to always return HTML error pages slight conflict caused by theming code - app/models/bookmark.rb finally merged upstream, no real conflict - spec/controllers/api/v1/bookmarks_controller_spec.rb finally merged upstream, slightly changed pagination code
Diffstat (limited to 'config/locales/devise.zh-CN.yml')
-rw-r--r-- | config/locales/devise.zh-CN.yml | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/config/locales/devise.zh-CN.yml b/config/locales/devise.zh-CN.yml index f9943238e..65c0a5c9d 100644 --- a/config/locales/devise.zh-CN.yml +++ b/config/locales/devise.zh-CN.yml @@ -2,7 +2,7 @@ zh-CN: devise: confirmations: - confirmed: 成功验证你的邮箱地址。 + confirmed: 已成功确认你的邮箱地址。 send_instructions: 你的电子邮箱将在几分钟后收到一封确认邮件。如果没有,请检查你的垃圾邮箱。 send_paranoid_instructions: 如果你的邮箱存在于我们的数据库中,你将收到一封确认注册的邮件。如果没有,请检查你的垃圾邮箱。 failure: @@ -46,6 +46,18 @@ zh-CN: extra: 如果你并没有请求本次变更,请忽略此邮件。你的密码只有在你点击上面的链接并输入新密码后才会更改。 subject: Mastodon:重置密码信息 title: 重置密码 + two_factor_disabled: + explanation: 账户的双重认证已禁用。现在仅使用邮箱和密码登录即可登录。 + subject: Mastodon:双重认证已禁用。 + title: 双重认证禁用 + two_factor_enabled: + explanation: 账户双重认证已启用。登录时将需要来自已配对的 TOTP 应用生成的验证码。 + subject: 'Mastodon: 双重验证已开启' + title: 已启用双重认证 + two_factor_recovery_codes_changed: + explanation: 之前的恢复码已失效,现已生成了新的恢复码。 + subject: Mastodon:重新生成双重认证的恢复码 + title: 双重验证的恢复码已更改 unlock_instructions: subject: Mastodon:帐户解锁信息 omniauth_callbacks: |