diff options
author | David Yip <yipdw@member.fsf.org> | 2018-03-02 21:46:44 -0600 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-03-02 21:46:44 -0600 |
commit | 1b8fcd4df52c8d715f89180faea8205310f197ae (patch) | |
tree | 705b8b59bafdd26cb96983e2da0104e8b7308ea7 /config/locales/pt-BR.yml | |
parent | ee00da01d2e4cc455b92f1f4a7c9142c73048433 (diff) | |
parent | ecf06d7e821a4b8f4585f1b6f0e39c595ed047ce (diff) |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: README.md app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/serializers/rest/instance_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.ja.yml
Diffstat (limited to 'config/locales/pt-BR.yml')
-rw-r--r-- | config/locales/pt-BR.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index cc3876a6c..f51abeff2 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -633,7 +633,7 @@ pt-BR: stream_entries: click_to_show: Clique para mostrar pinned: Toot fixado - reblogged: compartilhado + reblogged: compartilhou sensitive_content: Conteúdo sensível terms: body_html: | |