diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-09 00:17:17 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-09 00:17:17 +0000 |
| commit | 447d7e612753d69f043e08ebb228b21e411c8b4a (patch) | |
| tree | 80caebcff2b131898f620f89ad0858d44530d30f /config/locales/zh-CN.yml | |
| parent | 43a9a781a443a6b9296431fbcc4285b3ca6a1a57 (diff) | |
| parent | ff44b2e92d496c6027b20157fea6ebd885906bea (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'config/locales/zh-CN.yml')
| -rw-r--r-- | config/locales/zh-CN.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 1bd2e5039..1254651cd 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -351,7 +351,6 @@ zh-CN: your_token: 你的访问令牌 auth: agreement_html: 注册即表示你同意遵守<a href="%{rules_path}">本实例的相关规定</a>和<a href="%{terms_path}">我们的使用条款</a>。 - change_password: 帐户安全 delete_account: 删除帐户 delete_account_html: 如果你想删除你的帐户，请<a href="%{path}">点击这里继续</a>。你需要确认你的操作。 didnt_get_confirmation: 没有收到确认邮件？ @@ -364,6 +363,7 @@ zh-CN: register: 注册 resend_confirmation: 重新发送确认邮件 reset_password: 重置密码 + security: 帐户安全 set_new_password: 设置新密码 authorize_follow: error: 对不起，寻找这个跨站用户时出错 |