From 8e1e7144fdbdea944988f1ed775d35c77c05b2d2 Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Thu, 25 Jun 2020 15:34:48 -0500 Subject: [PATCH] Change notification settings keys to new names, remove the defunct non_follows key. --- src/i18n/de.json | 4 ++-- src/i18n/et.json | 7 +++---- src/i18n/fi.json | 7 +++---- src/i18n/fr.json | 7 +++---- src/i18n/it.json | 7 +++---- src/i18n/nl.json | 7 +++---- src/i18n/pl.json | 7 +++---- src/i18n/ru.json | 7 +++---- src/i18n/zh.json | 7 +++---- 9 files changed, 26 insertions(+), 34 deletions(-) diff --git a/src/i18n/de.json b/src/i18n/de.json index a44e58cb..feb5748f 100644 --- a/src/i18n/de.json +++ b/src/i18n/de.json @@ -401,8 +401,8 @@ "changed_email": "Email Adresse erfolgreich geändert!", "change_email_error": "Es trat ein Problem auf beim Versuch, deine Email Adresse zu ändern.", "change_email": "Ändere Email", - "notification_setting_non_followers": "Nutzer, die dir nicht folgen", - "notification_setting_followers": "Nutzer, die dir folgen", + "notification_setting_from_strangers": "Nutzer, die dir nicht folgen", + "notification_setting_from_followers": "Nutzer, die dir folgen", "import_blocks_from_a_csv_file": "Importiere Blocks von einer CSV Datei", "accent": "Akzent" }, diff --git a/src/i18n/et.json b/src/i18n/et.json index b5ae4275..656dd2f9 100644 --- a/src/i18n/et.json +++ b/src/i18n/et.json @@ -308,10 +308,9 @@ "notifications": "Teated", "notification_mutes": "Kui soovid mõnelt kasutajalt mitte teateid saada, kasuta vaigistust.", "notification_setting_privacy": "Privaatsus", - "notification_setting_non_followers": "Kasutajatelt, kes sind ei jälgi", - "notification_setting_followers": "Kasutajatelt, kes jälgivad sind", - "notification_setting_non_follows": "Kasutajatelt, keda sa ei jälgi", - "notification_setting_follows": "Kasutajatelt, keda jälgid", + "notification_setting_from_strangers": "Kasutajatelt, kes sind ei jälgi", + "notification_setting_from_followers": "Kasutajatelt, kes jälgivad sind", + "notification_setting_from_following": "Kasutajatelt, keda jälgid", "notification_setting_filters": "Filtrid", "greentext": "Meemi nooled", "fun": "Naljad", diff --git a/src/i18n/fi.json b/src/i18n/fi.json index 99a1b53a..920b7cf1 100644 --- a/src/i18n/fi.json +++ b/src/i18n/fi.json @@ -479,10 +479,9 @@ "pad_emoji": "Välistä emojit välilyönneillä lisätessäsi niitä valitsimesta", "mutes_tab": "Mykistykset", "new_email": "Uusi sähköpostiosoite", - "notification_setting_follows": "Käyttäjät joita seuraat", - "notification_setting_non_follows": "Käyttäjät joita et seuraa", - "notification_setting_followers": "Käyttäjät jotka seuraavat sinua", - "notification_setting_non_followers": "Käyttäjät jotka eivät seuraa sinua", + "notification_setting_from_following": "Käyttäjät joita seuraat", + "notification_setting_from_followers": "Käyttäjät jotka seuraavat sinua", + "notification_setting_from_strangers": "Käyttäjät jotka eivät seuraa sinua", "notification_setting_privacy": "Yksityisyys", "notification_mutes": "Jos et halua ilmoituksia joltain käyttäjältä, käytä mykistystä.", "notification_blocks": "Estäminen pysäyttää kaikki ilmoitukset käyttäjältä ja poistaa seurauksen.", diff --git a/src/i18n/fr.json b/src/i18n/fr.json index 31b69a0f..3a750b08 100644 --- a/src/i18n/fr.json +++ b/src/i18n/fr.json @@ -320,10 +320,9 @@ }, "notifications": "Notifications", "notification_setting": "Reçevoir les notifications de :", - "notification_setting_follows": "Utilisateurs que vous suivez", - "notification_setting_non_follows": "Utilisateurs que vous ne suivez pas", - "notification_setting_followers": "Utilisateurs qui vous suivent", - "notification_setting_non_followers": "Utilisateurs qui ne vous suivent pas", + "notification_setting_from_following": "Utilisateurs que vous suivez", + "notification_setting_from_followers": "Utilisateurs qui vous suivent", + "notification_setting_from_strangers": "Utilisateurs qui ne vous suivent pas", "notification_mutes": "Pour stopper la récéption de notifications d'un utilisateur particulier, utilisez un masquage.", "notification_blocks": "Bloquer un utilisateur stoppe toute notification et se désabonne de lui.", "enable_web_push_notifications": "Activer les notifications de push web", diff --git a/src/i18n/it.json b/src/i18n/it.json index 6c8be351..9e877389 100644 --- a/src/i18n/it.json +++ b/src/i18n/it.json @@ -281,10 +281,9 @@ "notification_mutes": "Per non ricevere notifiche da uno specifico utente, zittiscilo.", "notification_setting_privacy_option": "Nascondi mittente e contenuti delle notifiche push", "notification_setting_privacy": "Privacy", - "notification_setting_followers": "Utenti che ti seguono", - "notification_setting_non_followers": "Utenti che non ti seguono", - "notification_setting_non_follows": "Utenti che non segui", - "notification_setting_follows": "Utenti che segui", + "notification_setting_from_followers": "Utenti che ti seguono", + "notification_setting_from_strangers": "Utenti che non ti seguono", + "notification_setting_from_following": "Utenti che segui", "notification_setting": "Ricevi notifiche da:", "notification_setting_filters": "Filtri", "notifications": "Notifiche", diff --git a/src/i18n/nl.json b/src/i18n/nl.json index af728b6e..ce02ea3e 100644 --- a/src/i18n/nl.json +++ b/src/i18n/nl.json @@ -385,9 +385,8 @@ "link": "een leuke kleine link" } }, - "notification_setting_follows": "Gebruikers die je volgt", - "notification_setting_non_follows": "Gebruikers die je niet volgt", - "notification_setting_followers": "Gebruikers die je volgen", + "notification_setting_from_following": "Gebruikers die je volgt", + "notification_setting_from_followers": "Gebruikers die je volgen", "notification_setting_privacy": "Privacy", "notification_setting_privacy_option": "Verberg de afzender en inhoud van push meldingen", "notification_mutes": "Om niet langer meldingen te ontvangen van een specifieke gebruiker, kun je deze negeren.", @@ -464,7 +463,7 @@ "hide_follows_description": "Niet tonen wie ik volg", "show_moderator_badge": "Moderators badge tonen in mijn profiel", "notification_setting_filters": "Filters", - "notification_setting_non_followers": "Gebruikers die je niet volgen", + "notification_setting_from_strangers": "Gebruikers die je niet volgen", "notification_blocks": "Door een gebruiker te blokkeren, ontvang je geen meldingen meer van de gebruiker en wordt je abonnement op de gebruiker opgeheven.", "version": { "frontend_version": "Frontend Versie", diff --git a/src/i18n/pl.json b/src/i18n/pl.json index 61e09318..d259ecf4 100644 --- a/src/i18n/pl.json +++ b/src/i18n/pl.json @@ -406,10 +406,9 @@ "greentext": "Memiczne strzałki", "notifications": "Powiadomienia", "notification_setting": "Otrzymuj powiadomienia od:", - "notification_setting_follows": "Ludzi których obserwujesz", - "notification_setting_non_follows": "Ludzi których nie obserwujesz", - "notification_setting_followers": "Ludzi którzy obserwują ciebie", - "notification_setting_non_followers": "Ludzi którzy nie obserwują ciebie", + "notification_setting_from_following": "Ludzi których obserwujesz", + "notification_setting_from_followers": "Ludzi którzy obserwują ciebie", + "notification_setting_from_strangers": "Ludzi którzy nie obserwują ciebie", "notification_mutes": "By przestać otrzymywać powiadomienia od jednego użytkownika, wycisz go.", "notification_blocks": "Blokowanie uzytkownika zatrzymuje wszystkie powiadomienia i odsubskrybowuje go.", "enable_web_push_notifications": "Włącz powiadomienia push", diff --git a/src/i18n/ru.json b/src/i18n/ru.json index aa78db26..fabb370e 100644 --- a/src/i18n/ru.json +++ b/src/i18n/ru.json @@ -349,12 +349,11 @@ "link": "ссылка" } }, - "notification_setting_non_followers": "Не читающие вас", + "notification_setting_from_strangers": "Не читающие вас", "allow_following_move": "Разрешить автоматически читать новый аккаунт при перемещении на другой сервер", "hide_user_stats": "Не показывать статистику пользователей (например количество читателей)", - "notification_setting_followers": "Читающие вас", - "notification_setting_follows": "Читаемые вами", - "notification_setting_non_follows": "Не читаемые вами" + "notification_setting_from_followers": "Читающие вас", + "notification_setting_from_following": "Читаемые вами", }, "timeline": { "collapse": "Свернуть", diff --git a/src/i18n/zh.json b/src/i18n/zh.json index f95dc498..b95037ac 100644 --- a/src/i18n/zh.json +++ b/src/i18n/zh.json @@ -337,10 +337,9 @@ }, "notifications": "通知", "notification_setting": "通知来源：", - "notification_setting_follows": "你所关注的用户", - "notification_setting_non_follows": "你没有关注的用户", - "notification_setting_followers": "关注你的用户", - "notification_setting_non_followers": "没有关注你的用户", + "notification_setting_from_following": "你所关注的用户", + "notification_setting_from_followers": "关注你的用户", + "notification_setting_from_strangers": "没有关注你的用户", "notification_mutes": "要停止收到某个指定的用户的通知，请使用隐藏功能。", "notification_blocks": "拉黑一个用户会停掉所有他的通知，等同于取消关注。", "enable_web_push_notifications": "启用 web 推送通知",