diff --git a/app/javascript/mastodon/locales/dog.json b/app/javascript/mastodon/locales/dog.json
index 13e21d2cc5..2bec092915 100644
--- a/app/javascript/mastodon/locales/dog.json
+++ b/app/javascript/mastodon/locales/dog.json
@@ -122,12 +122,9 @@
"getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
"getting_started.security": "Security",
"getting_started.terms": "Terms of service",
- "home.column_settings.advanced": "Advanced",
"home.column_settings.basic": "Basic",
- "home.column_settings.filter_regex": "Filter out by regular expressions",
"home.column_settings.show_reblogs": "Show awoos",
"home.column_settings.show_replies": "Show barks",
- "home.settings": "Column settings",
"keyboard_shortcuts.back": "to navigate back",
"keyboard_shortcuts.boost": "to boost",
"keyboard_shortcuts.column": "to focus a status in one of the columns",
@@ -170,6 +167,7 @@
"navigation_bar.edit_profile": "Edit profile",
"navigation_bar.favourites": "Boops",
"navigation_bar.follow_requests": "Pack requests",
+ "navigation_bar.follow_requests": "Pack requests",
"navigation_bar.info": "About this instance",
"navigation_bar.keyboard_shortcuts": "Keyboard shortcuts",
"navigation_bar.lists": "Lists",
@@ -259,6 +257,7 @@
"status.direct": "Direct message @{name}",
"status.embed": "Embed",
"status.favourite": "Boop",
+ "status.filtered": "Filtered",
"status.load_more": "Load more",
"status.media_hidden": "Media hidden",
"status.mention": "Bark at @{name}",
diff --git a/app/javascript/mastodon/locales/lion.json b/app/javascript/mastodon/locales/lion.json
index 4c82b1b073..970bbaa1be 100644
--- a/app/javascript/mastodon/locales/lion.json
+++ b/app/javascript/mastodon/locales/lion.json
@@ -122,12 +122,9 @@
"getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
"getting_started.security": "Security",
"getting_started.terms": "Terms of service",
- "home.column_settings.advanced": "Advanced",
"home.column_settings.basic": "Basic",
- "home.column_settings.filter_regex": "Filter out by regular expressions",
"home.column_settings.show_reblogs": "Show roars",
"home.column_settings.show_replies": "Show meows",
- "home.settings": "Column settings",
"keyboard_shortcuts.back": "to navigate back",
"keyboard_shortcuts.boost": "to boost",
"keyboard_shortcuts.column": "to focus a status in one of the columns",
@@ -170,6 +167,7 @@
"navigation_bar.edit_profile": "Edit profile",
"navigation_bar.favourites": "Boops",
"navigation_bar.follow_requests": "Pride requests",
+ "navigation_bar.follow_requests": "Pride requests",
"navigation_bar.info": "About this instance",
"navigation_bar.keyboard_shortcuts": "Keyboard shortcuts",
"navigation_bar.lists": "Lists",
@@ -259,6 +257,7 @@
"status.direct": "Direct message @{name}",
"status.embed": "Embed",
"status.favourite": "Boop",
+ "status.filtered": "Filtered",
"status.load_more": "Load more",
"status.media_hidden": "Media hidden",
"status.mention": "Meow at @{name}",
diff --git a/config/locales/dog.yml b/config/locales/dog.yml
index f7b7fa54cd..785eeab409 100644
--- a/config/locales/dog.yml
+++ b/config/locales/dog.yml
@@ -261,6 +261,14 @@ dog:
expired: Expired
title: Filter
title: Invites
+ relays:
+ add_new: Add new relay
+ description_html: A federation relay is an intermediary server that exchanges large volumes of public toots between servers that subscribe and publish to it. It can help small and medium servers discover content from the fediverse, which would otherwise require local users manually following other people on remote servers.
+ enable_hint: Once enabled, your server will subscribe to all public toots from this relay, and will begin sending this server's public toots to it.
+ inbox_url: Relay URL
+ setup: Setup a relay connection
+ status: Status
+ title: Relays
report_notes:
created_msg: Report note successfully created!
destroyed_msg: Report note successfully deleted!
@@ -316,6 +324,9 @@ dog:
peers_api_enabled:
desc_html: Domain names this instance has encountered in the fediverse
title: Publish list of discovered instances
+ preview_sensitive_media:
+ desc_html: Link previews on other websites will display a thumbnail even if the media is marked as sensitive
+ title: Show sensitive media in OpenGraph previews
registrations:
closed_message:
desc_html: Displayed on frontpage when registrations are closed. You can use HTML tags
@@ -474,6 +485,22 @@ dog:
follows: You follow
mutes: You mute
storage: Media storage
+ filters:
+ contexts:
+ home: Home timeline
+ notifications: Notifications
+ public: Public timelines
+ thread: Conversations
+ edit:
+ title: Edit filter
+ errors:
+ invalid_context: None or invalid context supplied
+ invalid_irreversible: Irreversible filtering only works with home or notifications context
+ index:
+ delete: Delete
+ title: Filters
+ new:
+ title: Add new filter
followers:
domain: Domain
explanation_html: If you want to ensure the privacy of your toots, you must be aware of who is following you. Your private toots are delivered to all instances where you have followers. You may wish to review them, and remove followers if you do not trust your privacy to be respected by the staff or software of those instances.
@@ -599,6 +626,7 @@ dog:
remote_follow:
acct: Enter your username@domain you want to follow from
missing_resource: Could not find the required redirect URL for your account
+ no_account_html: Don't have an account? You can sign up here
proceed: Proceed to follow
prompt: 'You are going to follow:'
remote_unfollow:
diff --git a/config/locales/doorkeeper.dog.yml b/config/locales/doorkeeper.dog.yml
index d52a0b74b1..7e556c27f1 100644
--- a/config/locales/doorkeeper.dog.yml
+++ b/config/locales/doorkeeper.dog.yml
@@ -114,7 +114,29 @@ dog:
application:
title: OAuth authorization required
scopes:
- follow: follow, block, unblock and unfollow accounts
- push: receive push notifications for your account
- read: read your account's data
- write: post on your behalf
+ follow: modify account relationships
+ push: receive your push notifications
+ read: read all your account's data
+ read:accounts: see accounts information
+ read:blocks: see your blocks
+ read:favourites: see your favourites
+ read:filters: see your filters
+ read:follows: see your joined packs
+ read:lists: see your lists
+ read:mutes: see your mutes
+ read:notifications: see your notifications
+ read:reports: see your reports
+ read:search: search on your behalf
+ read:statuses: see all toots
+ write: modify all your account's data
+ write:accounts: modify your profile
+ write:blocks: block accounts and domains
+ write:favourites: favourite toots
+ write:filters: create filters
+ write:follows: join packs
+ write:lists: create lists
+ write:media: upload media files
+ write:mutes: mute dogs and conversations
+ write:notifications: clear your notifications
+ write:reports: report other dogs
+ write:statuses: publish toots
diff --git a/config/locales/doorkeeper.lion.yml b/config/locales/doorkeeper.lion.yml
index b3e3c1c60f..593c9c1854 100644
--- a/config/locales/doorkeeper.lion.yml
+++ b/config/locales/doorkeeper.lion.yml
@@ -114,7 +114,29 @@ lion:
application:
title: OAuth authorization required
scopes:
- follow: follow, block, unblock and unfollow accounts
- push: receive push notifications for your account
- read: read your account's data
- write: post on your behalf
+ follow: modify account relationships
+ push: receive your push notifications
+ read: read all your account's data
+ read:accounts: see accounts information
+ read:blocks: see your blocks
+ read:favourites: see your favourites
+ read:filters: see your filters
+ read:follows: see your joined prides
+ read:lists: see your lists
+ read:mutes: see your mutes
+ read:notifications: see your notifications
+ read:reports: see your reports
+ read:search: search on your behalf
+ read:statuses: see all toots
+ write: modify all your account's data
+ write:accounts: modify your profile
+ write:blocks: block accounts and domains
+ write:favourites: favourite toots
+ write:filters: create filters
+ write:follows: join prides
+ write:lists: create lists
+ write:media: upload media files
+ write:mutes: mute lions and conversations
+ write:notifications: clear your notifications
+ write:reports: report other lions
+ write:statuses: publish toots
diff --git a/config/locales/lion.yml b/config/locales/lion.yml
index 9719e9e581..7417fdf827 100644
--- a/config/locales/lion.yml
+++ b/config/locales/lion.yml
@@ -261,6 +261,14 @@ lion:
expired: Expired
title: Filter
title: Invites
+ relays:
+ add_new: Add new relay
+ description_html: A federation relay is an intermediary server that exchanges large volumes of public toots between servers that subscribe and publish to it. It can help small and medium servers discover content from the fediverse, which would otherwise require local users manually following other people on remote servers.
+ enable_hint: Once enabled, your server will subscribe to all public toots from this relay, and will begin sending this server's public toots to it.
+ inbox_url: Relay URL
+ setup: Setup a relay connection
+ status: Status
+ title: Relays
report_notes:
created_msg: Report note successfully created!
destroyed_msg: Report note successfully deleted!
@@ -316,6 +324,9 @@ lion:
peers_api_enabled:
desc_html: Domain names this instance has encountered in the fediverse
title: Publish list of discovered instances
+ preview_sensitive_media:
+ desc_html: Link previews on other websites will display a thumbnail even if the media is marked as sensitive
+ title: Show sensitive media in OpenGraph previews
registrations:
closed_message:
desc_html: Displayed on frontpage when registrations are closed. You can use HTML tags
@@ -474,6 +485,22 @@ lion:
follows: You follow
mutes: You mute
storage: Media storage
+ filters:
+ contexts:
+ home: Home timeline
+ notifications: Notifications
+ public: Public timelines
+ thread: Conversations
+ edit:
+ title: Edit filter
+ errors:
+ invalid_context: None or invalid context supplied
+ invalid_irreversible: Irreversible filtering only works with home or notifications context
+ index:
+ delete: Delete
+ title: Filters
+ new:
+ title: Add new filter
followers:
domain: Domain
explanation_html: If you want to ensure the privacy of your toots, you must be aware of who is following you. Your private toots are delivered to all instances where you have followers. You may wish to review them, and remove followers if you do not trust your privacy to be respected by the staff or software of those instances.
diff --git a/config/locales/simple_form.dog.yml b/config/locales/simple_form.dog.yml
index 37fc7d93be..a653af306e 100644
--- a/config/locales/simple_form.dog.yml
+++ b/config/locales/simple_form.dog.yml
@@ -6,21 +6,27 @@ dog:
autofollow: People who sign up through the invite will automatically follow you
avatar: PNG, GIF or JPG. At most 2MB. Will be downscaled to 400x400px
bot: This account mainly performs automated actions and might not be monitored
+ context: One or multiple contexts where the filter should apply
digest: Only sent after a long period of inactivity and only if you have received any personal messages in your absence
display_name:
one: 1 character left
other: %{count} characters left
fields: You can have up to 4 items displayed as a table on your profile
header: PNG, GIF or JPG. At most 2MB. Will be downscaled to 700x335px
+ inbox_url: Copy the URL from the frontpage of the relay you want to use
+ irreversible: Filtered toots will disappear irreversibly, even if filter is later removed
locale: The language of the user interface, e-mails and push notifications
locked: Requires you to manually approve followers
note:
one: 1 character left
other: %{count} characters left
+ phrase: Will be matched regardless of casing in text or content warning of a toot
+ scopes: Which APIs the application will be allowed to access. If you select a top-level scope, you don't need to select individual ones.
setting_default_language: The language of your toots can be detected automatically, but it's not always accurate
setting_hide_network: Who you follow and who follows you will not be shown on your profile
setting_noindex: Affects your public profile and status pages
setting_theme: Affects how Mastodon looks when you're logged in from any device.
+ whole_word: When the keyword or phrase is alphanumeric only, it will only be applied if it matches the whole word
imports:
data: CSV file exported from another Mastodon instance
sessions:
@@ -39,6 +45,7 @@ dog:
chosen_languages: Filter languages
confirm_new_password: Confirm new password
confirm_password: Confirm password
+ context: Filter contexts
current_password: Current password
data: Data
display_name: Display name
@@ -46,6 +53,8 @@ dog:
expires_in: Expire after
fields: Profile metadata
header: Header
+ inbox_url: URL of the relay inbox
+ irreversible: Drop instead of hide
locale: Interface language
locked: Lock account
max_uses: Max number of uses
@@ -53,6 +62,7 @@ dog:
note: Bio
otp_attempt: Two-factor code
password: Password
+ phrase: Keyword or phrase
setting_auto_play_gif: Auto-play animated GIFs
setting_boost_modal: Show confirmation dialog before boosting
setting_default_language: Posting language
@@ -70,6 +80,7 @@ dog:
type: Import type
username: Username
username_or_email: Username or Email
+ whole_word: Whole word
interactions:
must_be_follower: Block notifications from non-followers
must_be_following: Block notifications from people you don't follow