From 7ccbfb55dd511510f2f2c0ac08e774946628fc81 Mon Sep 17 00:00:00 2001 From: mayaeh Date: Thu, 28 Oct 2021 12:29:49 +0900 Subject: [PATCH] ran `yarn manage:translations en` (#16912) --- app/javascript/mastodon/locales/defaultMessages.json | 12 ++++++++---- app/javascript/mastodon/locales/en.json | 5 +++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json index 0ff7d92aa2..6ccca7406e 100644 --- a/app/javascript/mastodon/locales/defaultMessages.json +++ b/app/javascript/mastodon/locales/defaultMessages.json @@ -2264,8 +2264,12 @@ { "descriptors": [ { - "defaultMessage": "Show", - "id": "notifications.column_settings.filter_bar.show" + "defaultMessage": "Highlight unread notifications", + "id": "notifications.column_settings.unread_notifications.highlight" + }, + { + "defaultMessage": "Show filter bar", + "id": "notifications.column_settings.filter_bar.show_bar" }, { "defaultMessage": "Display all categories", @@ -2296,8 +2300,8 @@ "id": "notifications.permission_required" }, { - "defaultMessage": "Unread notification markers", - "id": "notifications.column_settings.unread_markers.category" + "defaultMessage": "Unread notifications", + "id": "notifications.column_settings.unread_notifications.category" }, { "defaultMessage": "Quick filter bar", diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index ebbad2b18a..a069c1e2fc 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -312,7 +312,7 @@ "notifications.column_settings.favourite": "Favourites:", "notifications.column_settings.filter_bar.advanced": "Display all categories", "notifications.column_settings.filter_bar.category": "Quick filter bar", - "notifications.column_settings.filter_bar.show": "Show", + "notifications.column_settings.filter_bar.show_bar": "Show filter bar", "notifications.column_settings.follow": "New followers:", "notifications.column_settings.follow_request": "New follow requests:", "notifications.column_settings.mention": "Mentions:", @@ -322,7 +322,8 @@ "notifications.column_settings.show": "Show in column", "notifications.column_settings.sound": "Play sound", "notifications.column_settings.status": "New posts:", - "notifications.column_settings.unread_markers.category": "Unread notification markers", + "notifications.column_settings.unread_notifications.category": "Unread notifications", + "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications", "notifications.filter.all": "All", "notifications.filter.boosts": "Boosts", "notifications.filter.favourites": "Favourites",