diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-04-08 19:53:32 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-04-08 19:53:32 +0200 |
| commit | ff73d43b3596d50d071fd3e6ab6f49608b62c9d1 (patch) | |
| tree | bf8dca3a3864b013b0e55476a21fb1ad0d97c41f /config/locales/simple_form.it.yml | |
| parent | e0c39f9fad837b77373220515f078f2443ddf553 (diff) | |
| parent | 68273a7c6d6c630b6c88764579580682e12eebce (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `Gemfile.lock`: Not a real conflict, just an upstream dependency udpated textually too close to a glitch-soc-only dependency. Updated dependencies like upstream. - `app/controllers/settings/preferences_controller.rb`: Upstream added settings where we had extra glitch-soc-specific settings. Added upstream's new settings. - `app/models/user.rb`: Upstream added settings where we had extra glitch-soc-specific settings. Added upstream's new settings. - `config/i18n-tasks.yml`: Not a real conflict, just a new upstream line too textually close to a glitch-soc-only line. Ported upstream's change.
Diffstat (limited to 'config/locales/simple_form.it.yml')
| -rw-r--r-- | config/locales/simple_form.it.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml index 7e44489b5..17cf652a4 100644 --- a/config/locales/simple_form.it.yml +++ b/config/locales/simple_form.it.yml @@ -151,7 +151,7 @@ it: phrase: Parola chiave o frase setting_advanced_layout: Abilita interfaccia web avanzata setting_aggregate_reblogs: Raggruppa condivisioni in timeline - setting_auto_play_gif: Play automatico GIF animate + setting_auto_play_gif: Riproduci automaticamente le GIF animate setting_boost_modal: Mostra dialogo di conferma prima del boost setting_crop_images: Ritaglia immagini in post non espansi a 16x9 setting_default_language: Lingua dei post @@ -169,7 +169,7 @@ it: setting_reduce_motion: Riduci movimento nelle animazioni setting_show_application: Rendi pubblica l'applicazione usata per inviare i post setting_system_font_ui: Usa il carattere predefinito del sistema - setting_theme: Tema sito + setting_theme: Tema del sito setting_trends: Mostra tendenze di oggi setting_unfollow_modal: Chiedi conferma prima di smettere di seguire qualcuno setting_use_blurhash: Mostra i gradienti colorati per i media nascosti |