diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-01-10 19:12:10 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-01-10 21:00:30 +0100 |
commit | a2a64ecd3e3551707412c47f0d16e484dea25632 (patch) | |
tree | bc4e0b8e0ca2a2735f527bff8bd73421c0ff72dd /config/locales/simple_form.gl.yml | |
parent | fb0c906c717f2b21bb63610742a357850142b522 (diff) | |
parent | 70801b850c78d7879182eeba4eae509af42fafeb (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - .eslintrc.yml Removed, as upstream removed it. - app/controllers/admin/statuses_controller.rb Minor code cleanup when porting one of our features. - app/models/account.rb Note length validation has changed upstream. We now use upstream's validation (dropped legacy glitch-soc account metadata stuff) but with configurable limit. - app/services/post_status_service.rb Upstream has added support for scheduled toots, refactoring the code a bit. Adapted our changes to this refactoring. - app/views/stream_entries/_detailed_status.html.haml Not a real conflict, changes too close. - app/views/stream_entries/_simple_status.html.haml Not a real conflict, changes too close.
Diffstat (limited to 'config/locales/simple_form.gl.yml')
-rw-r--r-- | config/locales/simple_form.gl.yml | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml index 35bf5e017..d5e0ef574 100644 --- a/config/locales/simple_form.gl.yml +++ b/config/locales/simple_form.gl.yml @@ -2,6 +2,13 @@ gl: simple_form: hints: + account_warning_preset: + text: Vostede pode utilizar dar formato ao toot, como URLs, etiquetas e mencións + admin_account_action: + send_email_notification: A usuaria recibirá unha explicación sobre o que lle aconteceu a súa conta + text_html: Optativo. Pode utilizar formato no toot. Pode <a href="%{path}">engadir avisos preestablecidos</a> para aforrar tempo + type_html: Escolla que facer con <strong>%{acct}</strong> + warning_preset_id: Optativo. Poderá engadir texto personalizado ao final do preestablecido defaults: autofollow: As persoas que se conectaron a través de un convite seguirana automáticamente a vostede avatar: PNG, GIF ou JPG. Máximo %{size}. Será reducida a %{dimensions}px @@ -40,6 +47,18 @@ gl: fields: name: Etiqueta value: Contido + account_warning_preset: + text: Texto preestablecido + admin_account_action: + send_email_notification: Notificar a usuaria por correo-e + text: Aviso personalizado + type: Acción + types: + disable: Desactivar + none: Non facer nada + silence: Acalar + suspend: Suspender e eliminar irreversiblemente datos da conta + warning_preset_id: Utilizar un aviso preestablecido defaults: autofollow: Convide a seguir a súa conta avatar: Avatar |