diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-11-12 13:28:03 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-11-12 13:28:03 +0100 |
commit | 93912f04988eab072a119a588342c68c5cdb52e0 (patch) | |
tree | 815a69053ed9f1eb5e86e62735220a53bfcef814 /config/locales/simple_form.oc.yml | |
parent | d37f426f95f812b44925e13c00eabb9d1cd76b1f (diff) | |
parent | d26c1cb2fe145b8d56a9c15e110a917e6f63068b (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/models/account.rb`: Conflict because we (glitch-soc) have disabled trending of posts without review. Discarded that upstream change. - `app/views/admin/settings/discovery/show.html.haml`: Just an extra setting in glitch-soc. Kept that extra setting.
Diffstat (limited to 'config/locales/simple_form.oc.yml')
-rw-r--r-- | config/locales/simple_form.oc.yml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/config/locales/simple_form.oc.yml b/config/locales/simple_form.oc.yml index c074b8945..b6e6da78f 100644 --- a/config/locales/simple_form.oc.yml +++ b/config/locales/simple_form.oc.yml @@ -14,6 +14,8 @@ oc: send_email_notification: L’utilizaire recebrà una explicacion de çò qu’arribèt a son compte text_html: Opcional. Podètz utilizar la sintaxi dels tuts. Podètz <a href="%{path}">ajustar un avertiment personalizat</a> per estalviar de temps type_html: Causir de qué far amb <strong>%{acct}</strong> + types: + disable: Empachar l’utilizaire d’utilizar son compte mas suprimir o amagar pas son contengut. warning_preset_id: Opcional. Podètz ajustar un tèxt personalizat a a fin de çò predefinit announcement: all_day: Se son marcadas, solament las datas de l’interval de temps seràn mostrada @@ -176,6 +178,11 @@ oc: hide: Rescondre complètament warn: Rescondre amb avertiment form_admin_settings: + custom_css: CSS personalizada + media_cache_retention_period: Durada de conservacion dels mèdias en cache + profile_directory: Activar l’annuari de perfils + registrations_mode: Qual se pòt marcar + require_invite_text: Requerir una rason per s’inscriure site_contact_email: Adreça de contacte site_contact_username: Nom d’utilizaire de contacte site_extended_description: Descripcion espandida @@ -183,6 +190,7 @@ oc: site_terms: Politica de confidencialitat site_title: Nom del servidor theme: Tèma per defaut + thumbnail: Miniatura del servidor interactions: must_be_follower: Blocar las notificacions del mond que vos sègon pas must_be_following: Blocar las notificacions del mond que seguètz pas @@ -221,6 +229,7 @@ oc: permissions_as_keys: Autorizacions position: Prioritat 'no': Non + not_recommended: Pas recomandat recommended: Recomandat required: mark: "*" |