diff --git a/config/locales-glitch/de.yml b/config/locales-glitch/de.yml index 233bf91b38..acef54ecd3 100644 --- a/config/locales-glitch/de.yml +++ b/config/locales-glitch/de.yml @@ -40,3 +40,8 @@ de: use_this: Benutze das settings: flavours: Varianten + notification_mailer: + reaction: + body: "%{name} hat auf deinen Beitrag reagiert:" + subject: "%{name} hat auf deinen Beitrag reagiert" + title: Neue Reaktion diff --git a/config/locales-glitch/en.yml b/config/locales-glitch/en.yml index 1485ee174d..e88e98191e 100644 --- a/config/locales-glitch/en.yml +++ b/config/locales-glitch/en.yml @@ -40,3 +40,8 @@ en: use_this: Use this settings: flavours: Flavours + notification_mailer: + reaction: + body: "%{name} reacted to your post:" + subject: "%{name} reacted to your post" + title: New reaction diff --git a/config/locales-glitch/fr.yml b/config/locales-glitch/fr.yml index 15c3f8ce52..770f5d4d9e 100644 --- a/config/locales-glitch/fr.yml +++ b/config/locales-glitch/fr.yml @@ -40,3 +40,8 @@ fr: use_this: Utiliser ceci settings: flavours: Thèmes + notification_mailer: + reaction: + body: "%{name} a réagi·e à votre message:" + subject: "%{name} a réagi·e à votre message" + title: Nouvelle réaction diff --git a/config/locales-glitch/simple_form.de.yml b/config/locales-glitch/simple_form.de.yml index 0d92038c58..293f851263 100644 --- a/config/locales-glitch/simple_form.de.yml +++ b/config/locales-glitch/simple_form.de.yml @@ -1,6 +1,7 @@ --- de: simple_form: +<<<<<<< HEAD glitch_only: glitch-soc hints: defaults: @@ -21,6 +22,7 @@ de: setting_hide_followers_count: Anzahl der Follower verbergen setting_skin: Skin setting_system_emoji_font: Systemschriftart für Emojis verwenden (nur für Glitch-Variante) + setting_visible_reactions: Anzahl der sichtbaren Emoji-Reaktionen notification_emails: trending_link: Neuer angesagter Link muss überprüft werden trending_status: Neuer angesagter Post muss überprüft werden diff --git a/config/locales-glitch/simple_form.en.yml b/config/locales-glitch/simple_form.en.yml index 2507894a8c..aaf63747dd 100644 --- a/config/locales-glitch/simple_form.en.yml +++ b/config/locales-glitch/simple_form.en.yml @@ -20,6 +20,7 @@ en: setting_hide_followers_count: Hide your followers count setting_skin: Skin setting_system_emoji_font: Use system's default font for emojis (applies to Glitch flavour only) + setting_visible_reactions: Number of visible emoji reactions notification_emails: trending_link: New trending link requires review trending_status: New trending post requires review diff --git a/config/locales-glitch/simple_form.fr.yml b/config/locales-glitch/simple_form.fr.yml index bc6302cf89..98489f9466 100644 --- a/config/locales-glitch/simple_form.fr.yml +++ b/config/locales-glitch/simple_form.fr.yml @@ -21,7 +21,9 @@ fr: setting_hide_followers_count: Cacher votre nombre d'abonné·e·s setting_skin: Thème setting_system_emoji_font: Utiliser la police par défaut du système pour les émojis (s'applique uniquement au mode Glitch) + setting_visible_reactions: Nombre de réactions emoji visibles notification_emails: trending_link: Un nouveau lien en tendances nécessite un examen trending_status: Un nouveau post en tendances nécessite un examen trending_tag: Un nouveau tag en tendances nécessite un examen + setting_visible_reactions: Nombre de réactions emoji visibles diff --git a/config/locales/de.yml b/config/locales/de.yml index 38f8a82c51..9cd804abc1 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -1355,10 +1355,6 @@ de: title: Neue Erwähnung poll: subject: Eine Umfrage von %{name} ist beendet - reaction: - body: "%{name} hat auf deinen Beitrag reagiert:" - subject: "%{name} hat auf deinen Beitrag reagiert" - title: Neue Reaktion reblog: body: 'Deinen Beitrag hat %{name} geteilt:' subject: "%{name} teilte deinen Beitrag" diff --git a/config/locales/en.yml b/config/locales/en.yml index 7797286946..83ba4b0408 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1433,10 +1433,6 @@ en: title: New mention poll: subject: A poll by %{name} has ended - reaction: - body: '%{name} reacted to your post:' - subject: '%{name} reacted to your post' - title: New reaction reblog: body: 'Your post was boosted by %{name}:' subject: "%{name} boosted your post" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index ec4525f2b7..5d805f875b 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -1339,10 +1339,6 @@ fr: title: Nouvelle mention poll: subject: Un sondage de %{name} est terminé - reaction: - body: "%{name} a réagi·e à votre message:" - subject: "%{name} a réagi·e à votre message" - title: Nouvelle réaction reblog: body: 'Votre message été partagé par %{name} :' subject: "%{name} a partagé votre message" diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml index 44d1a1519d..6f9187b5d1 100644 --- a/config/locales/simple_form.de.yml +++ b/config/locales/simple_form.de.yml @@ -216,7 +216,6 @@ de: setting_unfollow_modal: Bestätigungsdialog anzeigen, bevor jemandem entfolgt wird setting_use_blurhash: Farbverlauf für verborgene Medien anzeigen setting_use_pending_items: Langsamer Modus - setting_visible_reactions: Anzahl der sichtbaren Emoji-Reaktionen severity: Einschränkung sign_in_token_attempt: Sicherheitsschlüssel title: Titel diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 4480550cbb..a81b6627a0 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -221,7 +221,6 @@ en: setting_unfollow_modal: Show confirmation dialog before unfollowing someone setting_use_blurhash: Show colorful gradients for hidden media setting_use_pending_items: Slow mode - setting_visible_reactions: Number of visible emoji reactions severity: Severity sign_in_token_attempt: Security code title: Title diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml index 4d0a404f85..3fd3b4b350 100644 --- a/config/locales/simple_form.fr.yml +++ b/config/locales/simple_form.fr.yml @@ -215,7 +215,6 @@ fr: setting_unfollow_modal: Demander confirmation avant de vous désabonner d’un compte setting_use_blurhash: Afficher des dégradés colorés pour les médias cachés setting_use_pending_items: Mode lent - setting_visible_reactions: Nombre de réactions emoji visibles severity: Sévérité sign_in_token_attempt: Code de sécurité title: Nom