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.sc.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.sc.yml')
| -rw-r--r-- | config/locales/activerecord.sc.yml | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/config/locales/activerecord.sc.yml b/config/locales/activerecord.sc.yml index cae24d30c..aadd00287 100644 --- a/config/locales/activerecord.sc.yml +++ b/config/locales/activerecord.sc.yml @@ -5,13 +5,28 @@ sc: poll: expires_at: Iscadèntzia options: Seberos + user: + agreement: Acordu de servìtziu + email: Indiritzu de posta eletrònica + locale: Idioma + password: Crae + user/account: + username: Nòmine utente + user/invite_request: + text: Resone errors: models: account: attributes: username: - invalid: petzi lìteras, nùmeros e tratigheddos bassos + invalid: isceti lìteras, nùmeros e tratigheddos bassos + reserved: est prenotadu status: attributes: reblog: taken: de s'istadu esistet giai + user: + attributes: + email: + blocked: impreat unu frunidore de posta eletrònica proibidu + unreachable: paret chi no esistit |