diff options
author | David Yip <yipdw@member.fsf.org> | 2018-02-04 16:36:19 -0600 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-02-04 16:36:19 -0600 |
commit | a6fb1c58eead1357a307813c69f798f32bcf7cae (patch) | |
tree | d56d2721705d86a925279a737943cbaa28a60979 /config/locales/pt-BR.yml | |
parent | 530fcc1c14d2b7a38c1b734c0b18955f109f0f20 (diff) | |
parent | 38e0133e1b01c21a710111097102a6eb205b9b9b (diff) |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: .env.production.sample app/controllers/auth/confirmations_controller.rb db/schema.rb
Diffstat (limited to 'config/locales/pt-BR.yml')
-rw-r--r-- | config/locales/pt-BR.yml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index de1f9a358..6b911a9a9 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -290,6 +290,9 @@ pt-BR: open: desc_html: Permitir que qualquer um crie uma conta title: Cadastro aberto + show_known_fediverse_at_about_page: + desc_html: Quando ligado, vai mostrar toots de todo o fediverso conhecido na prévia da timeline. Senão, mostra somente toots locais. + title: Mostrar fediverso conhecido na prévia da timeline show_staff_badge: desc_html: Mostrar uma insígnia de Equipe na página de usuário title: Mostrar insígnia de equipe |