diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-10 09:36:47 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-11-10 09:36:47 +0100 |
| commit | c118918520c3c5b1d60451e9692c45f7bd7e32e4 (patch) | |
| tree | d192e63c8f2599c44189fbb3bc33b481e22fe28b /config/locales/simple_form.gl.yml | |
| parent | b2a25d446a9f4368ad9d1240b9da30bc33942da5 (diff) | |
| parent | 8fdbb4d00d371e7a900bec3a262216d95a784d52 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/models/custom_emoji.rb`: Not a real conflict, just upstream changing a line too close to a glitch-soc-specific validation. Applied upstream changes. - `app/models/public_feed.rb`: Not a real conflict, just upstream changing a line too close to a glitch-soc-specific parameter documentation. Applied upstream changes.
Diffstat (limited to 'config/locales/simple_form.gl.yml')
| -rw-r--r-- | config/locales/simple_form.gl.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml index 9aa9c5745..bcd7453f6 100644 --- a/config/locales/simple_form.gl.yml +++ b/config/locales/simple_form.gl.yml @@ -66,6 +66,8 @@ gl: email_domain_block: domain: Este pode ser o nome de dominio que aparece no enderezo de email ou o rexistro MX que utiliza. Será comprobado no momento do rexistro. with_dns_records: Vaise facer un intento de resolver os rexistros DNS proporcionados e os resultados tamén irán a lista de bloqueo + featured_tag: + name: 'Aquí tes algún dos cancelos que usaches recentemente:' filters: action: Elixe a acción a realizar cando algunha publicación coincida co filtro actions: |