diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-03-27 21:54:44 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-03-27 21:54:44 +0100 |
| commit | 7b435fd9bf81265241fab792d8e8e0c2f4f1b619 (patch) | |
| tree | ef366f436ed5180489cc9377268e10328fe9a932 /config/locales/simple_form.oc.yml | |
| parent | 02f1c04fabab221130de8dfb5611be81825b193b (diff) | |
| parent | 6c79b7237e31eb510af7df3f4f2cb133dea39845 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/services/post_status_service.rb`: CW/sensitive logic fixed upstream, but different in glitch-soc. Ported the changes accordingly.
Diffstat (limited to 'config/locales/simple_form.oc.yml')
| -rw-r--r-- | config/locales/simple_form.oc.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/locales/simple_form.oc.yml b/config/locales/simple_form.oc.yml index b7495c56d..f1daa0e6e 100644 --- a/config/locales/simple_form.oc.yml +++ b/config/locales/simple_form.oc.yml @@ -8,6 +8,7 @@ oc: acct: Donatz l’utilizaire@domeni del compte ont volètz anar account_warning_preset: text: Podètz utilizar la sintaxi dels tuts, coma las URL, las etiquetas e las mencions + title: Opcional. Pas visible pel destinari admin_account_action: include_statuses: L’utilizaire veiràs quals tuts a provocat l’accion de moderacion o avertiment send_email_notification: L’utilizaire recebrà una explicacion de çò qu’arribèt a son compte @@ -78,6 +79,7 @@ oc: acct: Identificant del nòu compte account_warning_preset: text: Tèxt predefinit + title: Títol admin_account_action: include_statuses: Inclure los tuts senhalats dins lo corrièl send_email_notification: Avisar l’utilizaire per corrièl @@ -150,6 +152,8 @@ oc: username: Nom d’utilizaire username_or_email: Nom d’utilizaire o corrièl whole_word: Mot complèt + email_domain_block: + with_dns_records: Inclure los enregistraments MX e las IP del domeni featured_tag: name: Etiqueta interactions: |