diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-04-10 09:16:08 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-04-10 09:16:08 +0200 |
| commit | 5085559b15ef1c1fe3742757d00e5651fc52b5b5 (patch) | |
| tree | 0249b98caced1e39387564f04391eb1a0c39a2d7 /config/locales/pt-BR.yml | |
| parent | cb410f80a40d03b509cec244b0cdd4ed3957c6a0 (diff) | |
| parent | 830c2a9ccbe98e145640e12637ef3da56f41a7b5 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.
Diffstat (limited to 'config/locales/pt-BR.yml')
| -rw-r--r-- | config/locales/pt-BR.yml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 6a82a41b1..2d1171288 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -507,7 +507,6 @@ pt-BR: warning: Tenha cuidado com estes dados. Nunca compartilhe com alguém! your_token: Seu token de acesso auth: - agreement_html: Ao se cadastrar você concorda em seguir <a href="%{rules_path}">as regras da instância</a> e <a href="%{terms_path}">os nossos termos de serviço</a>. apply_for_account: Pedir um convite change_password: Senha checkbox_agreement_html: Eu concordo com <a href="%{rules_path}" target="_blank">as regras do servidor</a> e com <a href="%{terms_path}" target="_blank">os termos de serviço</a> @@ -868,9 +867,7 @@ pt-BR: notifications: Notificações preferences: Preferências relationships: Seguindo e seguidores - settings: Configurações two_factor_authentication: Autenticação em dois passos - your_apps: Seus aplicativos statuses: attached: description: 'Anexado: %{attached}' |