diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2020-12-23 01:47:45 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2020-12-23 01:47:45 +0100 |
| commit | 537afa00f35dbaa98cbff284683317b411104a82 (patch) | |
| tree | d71a57d5f5b6bd864ec11cc1c914a6c3b30ba612 /config/locales/gl.yml | |
| parent | 81f4c550b2ed305f39f344d10289b38625f70bf7 (diff) | |
| parent | 444b21b55ff5768e4cbbaf7cfa8285c65a4b54f9 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/lib/feed_manager.rb`: Not a real conflict, glitch-soc-only DM-related method too close to changed upstream stuff. Ported upstream changes. - `app/services/batched_remove_status_service.rb`: Additional logic in glitch-soc to clear DMs from timelines. Ported upstream changes and fixed the DM TL clearing logic. - `app/workers/scheduler/feed_cleanup_scheduler.rb`: Additional code in glitch-soc to clear DM timelines. Ported upstream changes.
Diffstat (limited to 'config/locales/gl.yml')
| -rw-r--r-- | config/locales/gl.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 36980f800..48aaff0ad 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -402,6 +402,8 @@ gl: silence: Silenciar suspend: Suspender title: Novo bloqueo de dominio + obfuscate: Ofuscar o nome de dominio + obfuscate_hint: Ofuscar parcialmente o nome do dominio na lista se está activada a publicación da lista de limitacións de dominio private_comment: Comentario privado private_comment_hint: Comentar sobre esta limitación de dominio para uso interno polos moderadores. public_comment: Comentario público @@ -564,6 +566,7 @@ gl: domain_blocks_rationale: title: Amosar motivo enable_bootstrap_timeline_accounts: + desc_html: Facer que as novas usuarias sigan automáticamente certas contas para que así a cronoloxía inicial non esté baleira title: Activar seguimentos por omisión para novas usuarias hero: desc_html: Amosado na páxina principal. Polo menos 600x100px recomendados. Se non está definido, estará por defecto a miniatura do servidor @@ -921,6 +924,8 @@ gl: status: Estado da validación view_proof: Ver proba imports: + errors: + over_rows_processing_limit: contén máis de %{count} filas modes: merge: Fusionar merge_long: Manter os rexistros actuais e engadir novos |