diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-06 09:50:41 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-11-06 09:50:41 +0100 |
| commit | 0ad919b19257b7d8eb447f7955030927d26cdbe6 (patch) | |
| tree | d78bd5ba447da166bb7d97a3df3e6d97902a5cdb /config/locales/activerecord.pt-BR.yml | |
| parent | 2f8fb49d1314db931385089bc9004a48700161ad (diff) | |
| parent | 5187e4e758b0636432d984d1a95a310cac536205 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: glitch-soc change because of having changed the default number of available poll options. Applied upstream's changes while keeping glitch-soc's default number of poll options. - `public/oops.png`: We had a minor graphics change, probably not worth diverging from upstream. Took upstream version.
Diffstat (limited to 'config/locales/activerecord.pt-BR.yml')
| -rw-r--r-- | config/locales/activerecord.pt-BR.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config/locales/activerecord.pt-BR.yml b/config/locales/activerecord.pt-BR.yml index 105f5a550..fa01c9c53 100644 --- a/config/locales/activerecord.pt-BR.yml +++ b/config/locales/activerecord.pt-BR.yml @@ -29,6 +29,10 @@ pt-BR: attributes: website: invalid: não é uma URL válida + import: + attributes: + data: + malformed: está incorreto status: attributes: reblog: @@ -43,6 +47,7 @@ pt-BR: user_role: attributes: permissions_as_keys: + dangerous: inlcuir permissões que não são seguras para a função base elevated: não pode incluir permissões que a sua função atual não possui own_role: não pode ser alterado com sua função atual position: |