diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-11-06 00:33:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-06 00:33:55 +0100 |
| commit | a25839340e93b1e93b7b99b0f65fa7da7d62bad2 (patch) | |
| tree | a329d65c115e752c3be5c262ebf96f69cd13861a /app/javascript | |
| parent | e0f39626973fd9f5cce2d4cd3b166fb47e9c9059 (diff) | |
| parent | 4bb6b1a1e788abac7d1745e0f4eb72ad4d4ec110 (diff) | |
Merge pull request #1628 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript')
| -rw-r--r-- | app/javascript/mastodon/locales/defaultMessages.json | 12 | ||||
| -rw-r--r-- | 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 7dd2d2cb7..2c5f5fc74 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 61b828686..9b18659dc 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -317,7 +317,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:", @@ -327,7 +327,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", |