diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-05-07 18:21:59 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-05-07 18:21:59 +0200 |
| commit | 50b430d9a2857edf8ab44e9b94c7bcb14ecd2117 (patch) | |
| tree | 4932ca1d8e52f6ce9b8b9fbb304b6bfce4027e54 /config/locales/activerecord.zh-CN.yml | |
| parent | a346912030012dc1451249373ff7ef1a61016517 (diff) | |
| parent | d8e0c8a89e1f1dd1c4ce1513deaeb3c85c6e4a42 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
- `app/views/statuses/_simple_status.html.haml`: Small markup change in glitch-soc, on a line that has been modified by upstream. Ported upstream changes.
Diffstat (limited to 'config/locales/activerecord.zh-CN.yml')
| -rw-r--r-- | config/locales/activerecord.zh-CN.yml | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/config/locales/activerecord.zh-CN.yml b/config/locales/activerecord.zh-CN.yml index 8d2ddfd14..946e81893 100644 --- a/config/locales/activerecord.zh-CN.yml +++ b/config/locales/activerecord.zh-CN.yml @@ -5,13 +5,28 @@ zh-CN: poll: expires_at: 截止时间 options: 选项 + user: + agreement: 服务协议 + email: 电子邮箱地址 + locale: 本地化 + password: 密码 + user/account: + username: 用户名 + user/invite_request: + text: 理由 errors: models: account: attributes: username: invalid: 只能使用字母、数字和下划线 + reserved: 是保留关键字 status: attributes: reblog: taken: 已经被转嘟过 + user: + attributes: + email: + blocked: 使用了被封禁的电子邮件提供商 + unreachable: 似乎不存在 |