diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-10-25 20:28:51 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-10-25 20:28:51 +0200 |
| commit | e855df149bd2f19729af48cd5f452fa3972273f8 (patch) | |
| tree | 4d9dab4fd4568f67b07642db61a2f382e8b1dcc0 /config/locales/activerecord.pt-BR.yml | |
| parent | c647fa99cab9b9db81d36223cf2c2c27e065b648 (diff) | |
| parent | 5ba46952af87e42a64962a34f7ec43bc710bdcaf (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.env.production.sample`: Upstream added new configuration options, uncommented by default. Commented them. - `Gemfile.lock`: Upstream updated dependencies textually close to glitch-soc-specific dependencies. Updated those upstream dependencies.
Diffstat (limited to 'config/locales/activerecord.pt-BR.yml')
| -rw-r--r-- | config/locales/activerecord.pt-BR.yml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/config/locales/activerecord.pt-BR.yml b/config/locales/activerecord.pt-BR.yml index a6314cdae..8b4d3439a 100644 --- a/config/locales/activerecord.pt-BR.yml +++ b/config/locales/activerecord.pt-BR.yml @@ -3,30 +3,30 @@ pt-BR: activerecord: attributes: poll: - expires_at: Vencimento - options: Escolhas + expires_at: Prazo + options: Opções user: - agreement: Termos do Serviço - email: Endereço de e-mail - locale: Local + agreement: Termos de serviço + email: E-mail + locale: Idioma password: Senha user/account: - username: Nome de usuário + username: Usuário user/invite_request: - text: Motivos + text: Razão errors: models: account: attributes: username: invalid: apenas letras, números e underlines ( "_" ) - reserved: está reservado + reserved: já existe status: attributes: reblog: - taken: do status já existe + taken: do toot já existe user: attributes: email: - blocked: utiliza um provedor de e-mail não permitido + blocked: usa provedor de e-mail não permitido unreachable: parece não existir |