diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-01-07 13:30:52 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-01-07 13:30:52 -0600 |
| commit | f7c4d4464ba3b3729d707c54c4d2aa7515a9fe57 (patch) | |
| tree | b9dff90611207ec3dd075ca73fac32896dbab292 /config/locales/devise.zh-CN.yml | |
| parent | 70c99a9f34b645baa65982dfec5351869c1924fe (diff) | |
| parent | c2e1bfd9ae3f5fe65c4918a37143d48a2cc12bb3 (diff) | |
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
Diffstat (limited to 'config/locales/devise.zh-CN.yml')
| -rw-r--r-- | config/locales/devise.zh-CN.yml | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/config/locales/devise.zh-CN.yml b/config/locales/devise.zh-CN.yml index 5560e12b3..0bd855137 100644 --- a/config/locales/devise.zh-CN.yml +++ b/config/locales/devise.zh-CN.yml @@ -17,15 +17,17 @@ zh-CN: unconfirmed: 继续操作前请先确认你的帐户。 mailer: confirmation_instructions: - subject: Mastodon 帐户确认信息 + subject: Mastodon：确认 %{instance} 帐户信息 email_changed: - subject: Mastodon 电子邮件地址已被修改 + subject: Mastodon：电子邮件地址已被修改 password_change: - subject: Mastodon 密码已被重置 + subject: Mastodon：密码已被重置 + reconfirmation_instructions: + subject: Mastodon：确认 %{instance} 电子邮件地址 reset_password_instructions: - subject: Mastodon 重置密码信息 + subject: Mastodon：重置密码信息 unlock_instructions: - subject: Mastodon 帐户解锁信息 + subject: Mastodon：帐户解锁信息 omniauth_callbacks: failure: 由于%{reason}，无法从%{kind}获得授权。 success: 成功地从%{kind}获得授权。 |