diff --git a/app/javascript/mastodon/locales/dog.json b/app/javascript/mastodon/locales/dog.json
index 4efac9547..2e04b1d8e 100644
--- a/app/javascript/mastodon/locales/dog.json
+++ b/app/javascript/mastodon/locales/dog.json
@@ -1,10 +1,12 @@
{
+ "account.account_note_header": "Note",
"account.add_or_remove_from_list": "Add or Remove from lists",
"account.badges.bot": "Bot",
"account.badges.group": "Group",
"account.block": "Block @{name}",
"account.block_domain": "Hide everything from {domain}",
"account.blocked": "Blocked",
+ "account.browse_more_on_origin_server": "Browse more on the original profile",
"account.cancel_follow_request": "Cancel pack request",
"account.direct": "Direct message @{name}",
"account.domain_blocked": "Domain hidden",
@@ -13,7 +15,8 @@
"account.follow": "Join Pack",
"account.followers": "Pack Members",
"account.followers.empty": "No one has joined this dog's pack yet.",
- "account.follows": "Joined Packs",
+ "account.followers_counter": "{count, plural, one {{counter} pack member} other {{counter} pack members}}",
+ "account.following_counter": "{count, plural, one {{counter} joined pack} other {{counter} joined packs}}",
"account.follows.empty": "This dog hasn't joined any packs yet.",
"account.follows_you": "In your pack",
"account.hide_reblogs": "Hide awoos from @{name}",
@@ -33,12 +36,14 @@
"account.requested": "Awaiting approval. Click to cancel pack request",
"account.share": "Share @{name}'s profile",
"account.show_reblogs": "Show awoos from @{name}",
+ "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
"account.unblock": "Unblock @{name}",
- "account.unblock_domain": "Unhide {domain}",
+ "account.unblock_domain": "Unblock domain {domain}",
"account.unendorse": "Don't feature on profile",
"account.unfollow": "Leave Pack",
"account.unmute": "Unmute @{name}",
"account.unmute_notifications": "Unmute notifications from @{name}",
+ "account_note.placeholder": "Click to add note",
"alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
"alert.rate_limited.title": "Rate limited",
"alert.unexpected.message": "An unexpected error occurred.",
@@ -167,6 +172,7 @@
"follow_request.authorize": "Authorize",
"follow_request.reject": "Reject",
"follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+ "generic.saved": "Saved",
"getting_started.developers": "Developers",
"getting_started.directory": "Profile directory",
"getting_started.documentation": "Documentation",
@@ -236,6 +242,7 @@
"keyboard_shortcuts.reply": "to bark",
"keyboard_shortcuts.requests": "to open pack requests list",
"keyboard_shortcuts.search": "to focus search",
+ "keyboard_shortcuts.spoilers": "to show/hide CW field",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
"keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
@@ -412,20 +419,29 @@
"time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
"time_remaining.moments": "Moments remaining",
"time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
- "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
+ "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
+ "timeline_hint.resources.followers": "Pack Members",
+ "timeline_hint.resources.follows": "Joined Packs",
+ "timeline_hint.resources.statuses": "Older toots",
+ "trends.counter_by_accounts": "{count, plural, one {{counter} dog} other {{counter} dogs}} talking",
"trends.trending_now": "Trending now",
"ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
+ "units.short.billion": "{count}B",
+ "units.short.million": "{count}M",
+ "units.short.thousand": "{count}K",
"upload_area.title": "Drag & drop to upload",
- "upload_button.label": "Add media ({formats})",
+ "upload_button.label": "Add images, a video or an audio file",
"upload_error.limit": "File upload limit exceeded.",
"upload_error.poll": "File upload not allowed with polls.",
"upload_form.audio_description": "Describe for people with hearing loss",
"upload_form.description": "Describe for the visually impaired",
"upload_form.edit": "Edit",
+ "upload_form.thumbnail": "Change thumbnail",
"upload_form.undo": "Delete",
"upload_form.video_description": "Describe for people with hearing loss or visual impairment",
"upload_modal.analyzing_picture": "Analyzing picture…",
"upload_modal.apply": "Apply",
+ "upload_modal.choose_image": "Choose image",
"upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
"upload_modal.detect_text": "Detect text from picture",
"upload_modal.edit_media": "Edit media",
diff --git a/app/javascript/mastodon/locales/lion.json b/app/javascript/mastodon/locales/lion.json
index 2d2411b67..dd0c1c497 100644
--- a/app/javascript/mastodon/locales/lion.json
+++ b/app/javascript/mastodon/locales/lion.json
@@ -1,10 +1,12 @@
{
+ "account.account_note_header": "Note",
"account.add_or_remove_from_list": "Add or Remove from lists",
"account.badges.bot": "Bot",
"account.badges.group": "Group",
"account.block": "Block @{name}",
"account.block_domain": "Hide everything from {domain}",
"account.blocked": "Blocked",
+ "account.browse_more_on_origin_server": "Browse more on the original profile",
"account.cancel_follow_request": "Cancel pride request",
"account.direct": "Direct message @{name}",
"account.domain_blocked": "Domain hidden",
@@ -13,7 +15,8 @@
"account.follow": "Join pride",
"account.followers": "Pride Members",
"account.followers.empty": "No one has joined this lion's pride yet.",
- "account.follows": "Joined Prides",
+ "account.followers_counter": "{count, plural, one {{counter} pride member} other {{counter} pride members}}",
+ "account.following_counter": "{count, plural, one {{counter} joined pride} other {{counter} joined prides}}",
"account.follows.empty": "This lion hasn't joined any prides yet.",
"account.follows_you": "In your pride",
"account.hide_reblogs": "Hide roars from @{name}",
@@ -33,12 +36,14 @@
"account.requested": "Awaiting approval. Click to cancel pride request",
"account.share": "Share @{name}'s profile",
"account.show_reblogs": "Show roars from @{name}",
+ "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
"account.unblock": "Unblock @{name}",
"account.unblock_domain": "Unhide {domain}",
"account.unendorse": "Don't feature on profile",
"account.unfollow": "Leave Pride",
"account.unmute": "Unmute @{name}",
"account.unmute_notifications": "Unmute notifications from @{name}",
+ "account_note.placeholder": "Click to add note",
"alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
"alert.rate_limited.title": "Rate limited",
"alert.unexpected.message": "An unexpected error occurred.",
@@ -167,6 +172,7 @@
"follow_request.authorize": "Authorize",
"follow_request.reject": "Reject",
"follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+ "generic.saved": "Saved",
"getting_started.developers": "Developers",
"getting_started.directory": "Profile directory",
"getting_started.documentation": "Documentation",
@@ -236,6 +242,7 @@
"keyboard_shortcuts.reply": "to meow",
"keyboard_shortcuts.requests": "to open pride requests list",
"keyboard_shortcuts.search": "to focus search",
+ "keyboard_shortcuts.spoilers": "to show/hide CW field",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
"keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
@@ -412,21 +419,30 @@
"time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
"time_remaining.moments": "Moments remaining",
"time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
- "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
+ "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
+ "timeline_hint.resources.followers": "Pack Members",
+ "timeline_hint.resources.follows": "Joined Packs",
+ "timeline_hint.resources.statuses": "Older toots",
+ "trends.counter_by_accounts": "{count, plural, one {{counter} lion} other {{counter} lions}} talking",
"trends.trending_now": "Trending now",
"ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
+ "units.short.billion": "{count}B",
+ "units.short.million": "{count}M",
+ "units.short.thousand": "{count}K",
"upload_area.title": "Drag & drop to upload",
- "upload_button.label": "Add media ({formats})",
+ "upload_button.label": "Add images, a video or an audio file",
"upload_error.limit": "File upload limit exceeded.",
"upload_error.poll": "File upload not allowed with polls.",
"upload_form.audio_description": "Describe for people with hearing loss",
"upload_form.description": "Describe for the visually impaired",
"upload_form.edit": "Edit",
+ "upload_form.thumbnail": "Change thumbnail",
"upload_form.undo": "Delete",
"upload_form.video_description": "Describe for people with hearing loss or visual impairment",
"upload_modal.analyzing_picture": "Analyzing picture…",
"upload_modal.apply": "Apply",
- "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy lion",
+ "upload_modal.choose_image": "Choose image",
+ "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
"upload_modal.detect_text": "Detect text from picture",
"upload_modal.edit_media": "Edit media",
"upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
diff --git a/app/javascript/mastodon/locales/squeak.json b/app/javascript/mastodon/locales/squeak.json
index 4bbaf108b..b25865375 100644
--- a/app/javascript/mastodon/locales/squeak.json
+++ b/app/javascript/mastodon/locales/squeak.json
@@ -1,19 +1,22 @@
{
+ "account.account_note_header": "Note",
"account.add_or_remove_from_list": "Add or Remove from lists",
"account.badges.bot": "Bot",
"account.badges.group": "Group",
"account.block": "Block @{name}",
- "account.block_domain": "Hide everything from {domain}",
+ "account.block_domain": "Block domain {domain}",
"account.blocked": "Blocked",
+ "account.browse_more_on_origin_server": "Browse more on the original profile",
"account.cancel_follow_request": "Cancel follow request",
"account.direct": "Direct message @{name}",
- "account.domain_blocked": "Domain hidden",
+ "account.domain_blocked": "Domain blocked",
"account.edit_profile": "Edit profile",
"account.endorse": "Feature on profile",
"account.follow": "Follow",
"account.followers": "Followers",
"account.followers.empty": "No one follows this user yet.",
- "account.follows": "Follows",
+ "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
+ "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
"account.follows.empty": "This user doesn't follow anyone yet.",
"account.follows_you": "Follows you",
"account.hide_reblogs": "Hide pumps from @{name}",
@@ -33,12 +36,14 @@
"account.requested": "Awaiting approval. Click to cancel follow request",
"account.share": "Share @{name}'s profile",
"account.show_reblogs": "Show pumps from @{name}",
+ "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
"account.unblock": "Unblock @{name}",
"account.unblock_domain": "Unhide {domain}",
"account.unendorse": "Don't feature on profile",
"account.unfollow": "Unfollow",
"account.unmute": "Unmute @{name}",
"account.unmute_notifications": "Unmute notifications from @{name}",
+ "account_note.placeholder": "Click to add note",
"alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
"alert.rate_limited.title": "Rate limited",
"alert.unexpected.message": "An unexpected error occurred.",
@@ -167,6 +172,7 @@
"follow_request.authorize": "Authorize",
"follow_request.reject": "Reject",
"follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+ "generic.saved": "Saved",
"getting_started.developers": "Developers",
"getting_started.directory": "Profile directory",
"getting_started.documentation": "Documentation",
@@ -236,6 +242,7 @@
"keyboard_shortcuts.reply": "to reply",
"keyboard_shortcuts.requests": "to open follow requests list",
"keyboard_shortcuts.search": "to focus search",
+ "keyboard_shortcuts.spoilers": "to show/hide CW field",
"keyboard_shortcuts.start": "to open \"get started\" column",
"keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
"keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
@@ -412,20 +419,29 @@
"time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
"time_remaining.moments": "Moments remaining",
"time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
- "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
+ "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
+ "timeline_hint.resources.followers": "Followers",
+ "timeline_hint.resources.follows": "Follows",
+ "timeline_hint.resources.statuses": "Older toots",
+ "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
"trends.trending_now": "Trending now",
"ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
+ "units.short.billion": "{count}B",
+ "units.short.million": "{count}M",
+ "units.short.thousand": "{count}K",
"upload_area.title": "Drag & drop to upload",
- "upload_button.label": "Add media ({formats})",
+ "upload_button.label": "Add images, a video or an audio file",
"upload_error.limit": "File upload limit exceeded.",
"upload_error.poll": "File upload not allowed with polls.",
"upload_form.audio_description": "Describe for people with hearing loss",
"upload_form.description": "Describe for the visually impaired",
"upload_form.edit": "Edit",
+ "upload_form.thumbnail": "Change thumbnail",
"upload_form.undo": "Delete",
"upload_form.video_description": "Describe for people with hearing loss or visual impairment",
"upload_modal.analyzing_picture": "Analyzing picture…",
"upload_modal.apply": "Apply",
+ "upload_modal.choose_image": "Choose image",
"upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
"upload_modal.detect_text": "Detect text from picture",
"upload_modal.edit_media": "Edit media",
diff --git a/config/locales/devise.dog.yml b/config/locales/devise.dog.yml
index 11547a390..f66749e81 100644
--- a/config/locales/devise.dog.yml
+++ b/config/locales/devise.dog.yml
@@ -21,7 +21,7 @@ dog:
action: Verify email address
action_with_app: Confirm and return to %{app}
explanation: You have created an account on %{host} with this email address. You are one click away from activating it. If this wasn't you, please ignore this email.
- explanation_when_pending: You applied for an invite to %{host} with this email address. Once you confirm your e-mail address, we will review your application. You can't login until then. If your application is rejected, your data will be removed, so no further action will be required from you. If this wasn't you, please ignore this email.
+ explanation_when_pending: You applied for an invite to %{host} with this email address. Once you confirm your e-mail address, we will review your application. You can login to change your details or delete your account, but you cannot access most of the functions until your account is approved. If your application is rejected, your data will be removed, so no further action will be required from you. If this wasn't you, please ignore this email.
extra_html: Please also check out the rules of the server and our terms of service.
subject: 'Mastodon: Confirmation instructions for %{instance}'
title: Verify email address
diff --git a/config/locales/devise.lion.yml b/config/locales/devise.lion.yml
index 2bacc994a..d92c90915 100644
--- a/config/locales/devise.lion.yml
+++ b/config/locales/devise.lion.yml
@@ -21,7 +21,7 @@ lion:
action: Verify email address
action_with_app: Confirm and return to %{app}
explanation: You have created an account on %{host} with this email address. You are one click away from activating it. If this wasn't you, please ignore this email.
- explanation_when_pending: You applied for an invite to %{host} with this email address. Once you confirm your e-mail address, we will review your application. You can't login until then. If your application is rejected, your data will be removed, so no further action will be required from you. If this wasn't you, please ignore this email.
+ explanation_when_pending: You applied for an invite to %{host} with this email address. Once you confirm your e-mail address, we will review your application. You can login to change your details or delete your account, but you cannot access most of the functions until your account is approved. If your application is rejected, your data will be removed, so no further action will be required from you. If this wasn't you, please ignore this email.
extra_html: Please also check out the rules of the server and our terms of service.
subject: 'Mastodon: Confirmation instructions for %{instance}'
title: Verify email address
diff --git a/config/locales/devise.squeak.yml b/config/locales/devise.squeak.yml
index d3c603bc2..81a1ea59a 100644
--- a/config/locales/devise.squeak.yml
+++ b/config/locales/devise.squeak.yml
@@ -21,7 +21,7 @@ squeak:
action: Verify email address
action_with_app: Confirm and return to %{app}
explanation: You have created an account on %{host} with this email address. You are one click away from activating it. If this wasn't you, please ignore this email.
- explanation_when_pending: You applied for an invite to %{host} with this email address. Once you confirm your e-mail address, we will review your application. You can't login until then. If your application is rejected, your data will be removed, so no further action will be required from you. If this wasn't you, please ignore this email.
+ explanation_when_pending: You applied for an invite to %{host} with this email address. Once you confirm your e-mail address, we will review your application. You can login to change your details or delete your account, but you cannot access most of the functions until your account is approved. If your application is rejected, your data will be removed, so no further action will be required from you. If this wasn't you, please ignore this email.
extra_html: Please also check out the rules of the server and our terms of service.
subject: 'Mastodon: Confirmation instructions for %{instance}'
title: Verify email address
diff --git a/config/locales/dog.yml b/config/locales/dog.yml
index cfeb95c40..445b5da67 100644
--- a/config/locales/dog.yml
+++ b/config/locales/dog.yml
@@ -39,9 +39,12 @@ dog:
unavailable_content_description:
domain: Server
reason: Reason
- rejecting_media: 'Media files from these servers will not be processed or stored, and and no thumbnails will be displayed, requiring manual click-through to the original file:'
+ rejecting_media: 'Media files from these servers will not be processed or stored, and no thumbnails will be displayed, requiring manual click-through to the original file:'
+ rejecting_media_title: Filtered media
silenced: 'Posts from these servers will be hidden in public timelines and conversations, and no notifications will be generated from their users'' interactions, unless you are following them:'
+ silenced_title: Silenced servers
suspended: 'No data from these servers will be processed, stored or exchanged, making any interaction or communication with users from these servers impossible:'
+ suspended_title: Suspended servers
unavailable_content_html: Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.
user_count_after:
one: dog
@@ -309,6 +312,7 @@ dog:
listed: Listed
new:
title: Add new custom emoji
+ not_permitted: You are not permitted to perform this action
overwrite: Overwrite
shortcode: Shortcode
shortcode_hint: At least 2 characters, only alphanumeric characters and underscores
@@ -346,14 +350,14 @@ dog:
week_interactions: interactions this week
week_users_active: active this week
week_users_new: dogs this week
- whitelist_mode: Whitelist mode
+ whitelist_mode: Limited federation mode
domain_allows:
- add_new: Whitelist domain
- created_msg: Domain has been successfully whitelisted
- destroyed_msg: Domain has been removed from the whitelist
- undo: Remove from whitelist
+ add_new: Allow federation with domain
+ created_msg: Domain has been successfully allowed for federation
+ destroyed_msg: Domain has been disallowed from federation
+ undo: Disallow federation with domain
domain_blocks:
- add_new: Add new
+ add_new: Add new domain block
created_msg: Domain block is now being processed
destroyed_msg: Domain block has been undone
domain: Domain
@@ -394,16 +398,16 @@ dog:
view: View domain block
email_domain_blocks:
add_new: Add new
- created_msg: Successfully added e-mail domain to blacklist
+ created_msg: Successfully blocked e-mail domain
delete: Delete
- destroyed_msg: Successfully deleted e-mail domain from blacklist
+ destroyed_msg: Successfully unblocked e-mail domain
domain: Domain
- empty: No e-mail domains currently blacklisted.
+ empty: No e-mail domains currently blocked.
from_html: from %{domain}
new:
create: Add domain
- title: New e-mail blacklist entry
- title: E-mail blacklist
+ title: Block new e-mail domain
+ title: Blocked e-mail domains
instances:
by_domain: Domain
delivery_available: Delivery is available
@@ -447,7 +451,7 @@ dog:
pending: Waiting for relay's approval
save_and_enable: Save and enable
setup: Setup a relay connection
- signatures_not_enabled: Relays will not work correctly while secure mode or whitelist mode is enabled
+ signatures_not_enabled: Relays will not work correctly while secure mode or limited federation mode is enabled
status: Status
title: Relays
report_notes:
@@ -721,6 +725,10 @@ dog:
hint_html: "Tip: We won't ask you for your password again for the next hour."
invalid_password: Invalid password
prompt: Confirm password to continue
+ crypto:
+ errors:
+ invalid_key: is not a valid Ed25519 or Curve25519 key
+ invalid_signature: is not a valid Ed25519 signature
date:
formats:
default: "%b %d, %Y"
@@ -918,6 +926,7 @@ dog:
on_cooldown: You have recently migrated your account. This function will become available again in %{count} days.
past_migrations: Past migrations
proceed_with_move: Move followers
+ redirected_msg: Your account is now redirecting to %{acct}.
redirecting_to: Your account is redirecting to %{acct}.
set_redirect: Set redirect
warning:
@@ -931,6 +940,10 @@ dog:
redirect: Your current account's profile will be updated with a redirect notice and be excluded from searches
moderation:
title: Moderation
+ move_handler:
+ carry_blocks_over_text: This dog moved from %{acct}, which you had blocked.
+ carry_mutes_over_text: This dog moved from %{acct}, which you had muted.
+ copy_account_note_text: 'This user moved from %{acct}, here were your previous notes about them:'
notification_mailer:
digest:
action: View all notifications
@@ -1108,6 +1121,9 @@ dog:
spam_detected_and_silenced: This is an automated report. Spam has been detected and the sender has been silenced automatically. If this is a mistake, please unsilence the account.
statuses:
attached:
+ audio:
+ one: "%{count} audio"
+ other: "%{count} audio"
description: 'Attached: %{attached}'
image:
one: "%{count} image"
@@ -1283,6 +1299,12 @@ dog:
explanation: You requested a full backup of your Mastodon account. It's now ready for download!
subject: Your archive is ready for download
title: Archive takeout
+ sign_in_token:
+ details: 'Here are details of the attempt:'
+ explanation: 'We detected an attempt to sign in to your account from an unrecognized IP address. If this is you, please enter the security code below on the sign in challenge page:'
+ further_actions: 'If this wasn''t you, please change your password and enable two-factor authentication on your account. You can do so here:'
+ subject: Please confirm attempted sign in
+ title: Sign in attempt
warning:
explanation:
disable: While your account is frozen, your account data remains intact, but you cannot perform any actions until it is unlocked.
@@ -1320,11 +1342,14 @@ dog:
title: Welcome aboard, %{name}!
users:
follow_limit_reached: You cannot join more than %{limit} packs
+ generic_access_help_html: Trouble accessing your account? You may get in touch with %{email} for assistance
invalid_email: The e-mail address is invalid
invalid_otp_token: Invalid two-factor code
+ invalid_sign_in_token: Invalid security code
otp_lost_help_html: If you lost access to both, you may get in touch with %{email}
seamless_external_login: You are logged in via an external service, so password and e-mail settings are not available.
signed_in_as: 'Signed in as:'
+ suspicious_sign_in_confirmation: You appear to not have logged in from this device before, and you haven't logged in for a while, so we're sending a security code to your e-mail address to confirm that it's you.
verification:
explanation_html: 'You can verify yourself as the owner of the links in your profile metadata. For that, the linked website must contain a link back to your Mastodon profile. The link back must have a rel="me"
attribute. The text content of the link does not matter. Here is an example:'
verification: Verification
diff --git a/config/locales/lion.yml b/config/locales/lion.yml
index b9d836393..d7fdba379 100644
--- a/config/locales/lion.yml
+++ b/config/locales/lion.yml
@@ -39,9 +39,12 @@ lion:
unavailable_content_description:
domain: Server
reason: Reason
- rejecting_media: 'Media files from these servers will not be processed or stored, and and no thumbnails will be displayed, requiring manual click-through to the original file:'
+ rejecting_media: 'Media files from these servers will not be processed or stored, and no thumbnails will be displayed, requiring manual click-through to the original file:'
+ rejecting_media_title: Filtered media
silenced: 'Posts from these servers will be hidden in public timelines and conversations, and no notifications will be generated from their users'' interactions, unless you are following them:'
+ silenced_title: Silenced servers
suspended: 'No data from these servers will be processed, stored or exchanged, making any interaction or communication with users from these servers impossible:'
+ suspended_title: Suspended servers
unavailable_content_html: Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.
user_count_after:
one: lion
@@ -309,6 +312,7 @@ lion:
listed: Listed
new:
title: Add new custom emoji
+ not_permitted: You are not permitted to perform this action
overwrite: Overwrite
shortcode: Shortcode
shortcode_hint: At least 2 characters, only alphanumeric characters and underscores
@@ -346,14 +350,14 @@ lion:
week_interactions: interactions this week
week_users_active: active this week
week_users_new: lions this week
- whitelist_mode: Whitelist mode
+ whitelist_mode: Limited federation mode
domain_allows:
- add_new: Whitelist domain
- created_msg: Domain has been successfully whitelisted
- destroyed_msg: Domain has been removed from the whitelist
- undo: Remove from whitelist
+ add_new: Allow federation with domain
+ created_msg: Domain has been successfully allowed for federation
+ destroyed_msg: Domain has been disallowed from federation
+ undo: Disallow federation with domain
domain_blocks:
- add_new: Add new
+ add_new: Add new domain block
created_msg: Domain block is now being processed
destroyed_msg: Domain block has been undone
domain: Domain
@@ -394,16 +398,16 @@ lion:
view: View domain block
email_domain_blocks:
add_new: Add new
- created_msg: Successfully added e-mail domain to blacklist
+ created_msg: Successfully blocked e-mail domain
delete: Delete
- destroyed_msg: Successfully deleted e-mail domain from blacklist
+ destroyed_msg: Successfully unblocked e-mail domain
domain: Domain
- empty: No e-mail domains currently blacklisted.
+ empty: No e-mail domains currently blocked.
from_html: from %{domain}
new:
create: Add domain
- title: New e-mail blacklist entry
- title: E-mail blacklist
+ title: Block new e-mail domain
+ title: Blocked e-mail domains
instances:
by_domain: Domain
delivery_available: Delivery is available
@@ -721,6 +725,10 @@ lion:
hint_html: "Tip: We won't ask you for your password again for the next hour."
invalid_password: Invalid password
prompt: Confirm password to continue
+ crypto:
+ errors:
+ invalid_key: is not a valid Ed25519 or Curve25519 key
+ invalid_signature: is not a valid Ed25519 signature
date:
formats:
default: "%b %d, %Y"
@@ -918,6 +926,7 @@ lion:
on_cooldown: You have recently migrated your account. This function will become available again in %{count} days.
past_migrations: Past migrations
proceed_with_move: Move followers
+ redirected_msg: Your account is now redirecting to %{acct}.
redirecting_to: Your account is redirecting to %{acct}.
set_redirect: Set redirect
warning:
@@ -931,6 +940,10 @@ lion:
redirect: Your current account's profile will be updated with a redirect notice and be excluded from searches
moderation:
title: Moderation
+ move_handler:
+ carry_blocks_over_text: This lion moved from %{acct}, which you had blocked.
+ carry_mutes_over_text: This lion moved from %{acct}, which you had muted.
+ copy_account_note_text: 'This user moved from %{acct}, here were your previous notes about them:'
notification_mailer:
digest:
action: View all notifications
@@ -1108,6 +1121,9 @@ lion:
spam_detected_and_silenced: This is an automated report. Spam has been detected and the sender has been silenced automatically. If this is a mistake, please unsilence the account.
statuses:
attached:
+ audio:
+ one: "%{count} audio"
+ other: "%{count} audio"
description: 'Attached: %{attached}'
image:
one: "%{count} image"
@@ -1283,6 +1299,12 @@ lion:
explanation: You requested a full backup of your Mastodon account. It's now ready for download!
subject: Your archive is ready for download
title: Archive takeout
+ sign_in_token:
+ details: 'Here are details of the attempt:'
+ explanation: 'We detected an attempt to sign in to your account from an unrecognized IP address. If this is you, please enter the security code below on the sign in challenge page:'
+ further_actions: 'If this wasn''t you, please change your password and enable two-factor authentication on your account. You can do so here:'
+ subject: Please confirm attempted sign in
+ title: Sign in attempt
warning:
explanation:
disable: While your account is frozen, your account data remains intact, but you cannot perform any actions until it is unlocked.
@@ -1320,11 +1342,14 @@ lion:
title: Welcome aboard, %{name}!
users:
follow_limit_reached: You cannot join more than %{limit} prides
+ generic_access_help_html: Trouble accessing your account? You may get in touch with %{email} for assistance
invalid_email: The e-mail address is invalid
invalid_otp_token: Invalid two-factor code
+ invalid_sign_in_token: Invalid security code
otp_lost_help_html: If you lost access to both, you may get in touch with %{email}
seamless_external_login: You are logged in via an external service, so password and e-mail settings are not available.
signed_in_as: 'Signed in as:'
+ suspicious_sign_in_confirmation: You appear to not have logged in from this device before, and you haven't logged in for a while, so we're sending a security code to your e-mail address to confirm that it's you.
verification:
explanation_html: 'You can verify yourself as the owner of the links in your profile metadata. For that, the linked website must contain a link back to your Mastodon profile. The link back must have a rel="me"
attribute. The text content of the link does not matter. Here is an example:'
verification: Verification
diff --git a/config/locales/simple_form.dog.yml b/config/locales/simple_form.dog.yml
index ab9adc78f..9f952d8e4 100644
--- a/config/locales/simple_form.dog.yml
+++ b/config/locales/simple_form.dog.yml
@@ -152,6 +152,7 @@ dog:
setting_use_blurhash: Show colorful gradients for hidden media
setting_use_pending_items: Slow mode
severity: Severity
+ sign_in_token_attempt: Security code
type: Import type
username: Username
username_or_email: Username or Email
diff --git a/config/locales/simple_form.lion.yml b/config/locales/simple_form.lion.yml
index 2a4e8b6c7..a9f4312e9 100644
--- a/config/locales/simple_form.lion.yml
+++ b/config/locales/simple_form.lion.yml
@@ -152,6 +152,7 @@ lion:
setting_use_blurhash: Show colorful gradients for hidden media
setting_use_pending_items: Slow mode
severity: Severity
+ sign_in_token_attempt: Security code
type: Import type
username: Username
username_or_email: Username or Email
diff --git a/config/locales/simple_form.squeak.yml b/config/locales/simple_form.squeak.yml
index 47e8b3a51..7088bcbb6 100644
--- a/config/locales/simple_form.squeak.yml
+++ b/config/locales/simple_form.squeak.yml
@@ -152,6 +152,7 @@ squeak:
setting_use_blurhash: Show colorful gradients for hidden media
setting_use_pending_items: Slow mode
severity: Severity
+ sign_in_token_attempt: Security code
type: Import type
username: Username
username_or_email: Username or Email
diff --git a/config/locales/squeak.yml b/config/locales/squeak.yml
index cc84ea48b..f89160c56 100644
--- a/config/locales/squeak.yml
+++ b/config/locales/squeak.yml
@@ -35,13 +35,16 @@ squeak:
status_count_before: Who authored
tagline: Follow friends and discover new ones
terms: Terms of service
- unavailable_content: Unavailable content
+ unavailable_content: Moderated servers
unavailable_content_description:
domain: Server
reason: Reason
- rejecting_media: 'Media files from these servers will not be processed or stored, and and no thumbnails will be displayed, requiring manual click-through to the original file:'
- silenced: 'Posts from these servers will be hidden in public timelines and conversations, and no notifications will be generated from their users'' interactions, unless you are following them:'
+ rejecting_media: 'Media files from these servers will not be processed or stored, and no thumbnails will be displayed, requiring manual click-through to the original file:'
+ rejecting_media_title: Filtered media
+ silenced: 'Posts from these servers will be hidden in public timelines and conversations, and no notifications will be generated from their users interactions, unless you are following them:'
+ silenced_title: Silenced servers
suspended: 'No data from these servers will be processed, stored or exchanged, making any interaction or communication with users from these servers impossible:'
+ suspended_title: Suspended servers
unavailable_content_html: Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.
user_count_after:
one: user
@@ -92,7 +95,7 @@ squeak:
delete: Delete
destroyed_msg: Moderation note successfully destroyed!
accounts:
- add_email_domain_block: Blacklist e-mail domain
+ add_email_domain_block: Block e-mail domain
approve: Approve
approve_all: Approve all
are_you_sure: Are you sure?
@@ -193,7 +196,7 @@ squeak:
username: Username
warn: Warn
web: Web
- whitelisted: Whitelisted
+ whitelisted: Allowed for federation
action_logs:
action_types:
assigned_to_self_report: Assign Report
@@ -238,15 +241,15 @@ squeak:
create_account_warning: "%{name} sent a warning to %{target}"
create_announcement: "%{name} created new announcement %{target}"
create_custom_emoji: "%{name} uploaded new emoji %{target}"
- create_domain_allow: "%{name} whitelisted domain %{target}"
+ create_domain_allow: "%{name} allowed federation with domain %{target}"
create_domain_block: "%{name} blocked domain %{target}"
- create_email_domain_block: "%{name} blacklisted e-mail domain %{target}"
+ create_email_domain_block: "%{name} blocked e-mail domain %{target}"
demote_user: "%{name} demoted user %{target}"
destroy_announcement: "%{name} deleted announcement %{target}"
destroy_custom_emoji: "%{name} destroyed emoji %{target}"
- destroy_domain_allow: "%{name} removed domain %{target} from whitelist"
+ destroy_domain_allow: "%{name} disallowed federation with domain %{target}"
destroy_domain_block: "%{name} unblocked domain %{target}"
- destroy_email_domain_block: "%{name} whitelisted e-mail domain %{target}"
+ destroy_email_domain_block: "%{name} unblocked e-mail domain %{target}"
destroy_status: "%{name} removed status by %{target}"
disable_2fa_user: "%{name} disabled two factor requirement for user %{target}"
disable_custom_emoji: "%{name} disabled emoji %{target}"
@@ -309,6 +312,7 @@ squeak:
listed: Listed
new:
title: Add new custom emoji
+ not_permitted: You are not permitted to perform this action
overwrite: Overwrite
shortcode: Shortcode
shortcode_hint: At least 2 characters, only alphanumeric characters and underscores
@@ -346,12 +350,12 @@ squeak:
week_interactions: interactions this week
week_users_active: active this week
week_users_new: users this week
- whitelist_mode: Whitelist mode
+ whitelist_mode: Limited federation mode
domain_allows:
- add_new: Whitelist domain
- created_msg: Domain has been successfully whitelisted
- destroyed_msg: Domain has been removed from the whitelist
- undo: Remove from whitelist
+ add_new: Allow federation with domain
+ created_msg: Domain has been successfully allowed for federation
+ destroyed_msg: Domain has been disallowed from federation
+ undo: Disallow federation with domain
domain_blocks:
add_new: Add new domain block
created_msg: Domain block is now being processed
@@ -394,16 +398,16 @@ squeak:
view: View domain block
email_domain_blocks:
add_new: Add new
- created_msg: Successfully added e-mail domain to blacklist
+ created_msg: Successfully blocked e-mail domain
delete: Delete
- destroyed_msg: Successfully deleted e-mail domain from blacklist
+ destroyed_msg: Successfully unblocked e-mail domain
domain: Domain
- empty: No e-mail domains currently blacklisted.
+ empty: No e-mail domains currently blocked.
from_html: from %{domain}
new:
create: Add domain
- title: New e-mail blacklist entry
- title: E-mail blacklist
+ title: Block new e-mail domain
+ title: Blocked e-mail domains
instances:
by_domain: Domain
delivery_available: Delivery is available
@@ -721,6 +725,10 @@ squeak:
hint_html: "Tip: We won't ask you for your password again for the next hour."
invalid_password: Invalid password
prompt: Confirm password to continue
+ crypto:
+ errors:
+ invalid_key: is not a valid Ed25519 or Curve25519 key
+ invalid_signature: is not a valid Ed25519 signature
date:
formats:
default: "%b %d, %Y"
@@ -918,6 +926,7 @@ squeak:
on_cooldown: You have recently migrated your account. This function will become available again in %{count} days.
past_migrations: Past migrations
proceed_with_move: Move followers
+ redirected_msg: Your account is now redirecting to %{acct}.
redirecting_to: Your account is redirecting to %{acct}.
set_redirect: Set redirect
warning:
@@ -931,6 +940,10 @@ squeak:
redirect: Your current account's profile will be updated with a redirect notice and be excluded from searches
moderation:
title: Moderation
+ move_handler:
+ carry_blocks_over_text: This user moved from %{acct}, which you had blocked.
+ carry_mutes_over_text: This user moved from %{acct}, which you had muted.
+ copy_account_note_text: 'This user moved from %{acct}, here were your previous notes about them:'
notification_mailer:
digest:
action: View all notifications
@@ -1108,6 +1121,9 @@ squeak:
spam_detected_and_silenced: This is an automated report. Spam has been detected and the sender has been silenced automatically. If this is a mistake, please unsilence the account.
statuses:
attached:
+ audio:
+ one: "%{count} audio"
+ other: "%{count} audio"
description: 'Attached: %{attached}'
image:
one: "%{count} image"
@@ -1283,6 +1299,12 @@ squeak:
explanation: You requested a full backup of your Mastodon account. It's now ready for download!
subject: Your archive is ready for download
title: Archive takeout
+ sign_in_token:
+ details: 'Here are details of the attempt:'
+ explanation: 'We detected an attempt to sign in to your account from an unrecognized IP address. If this is you, please enter the security code below on the sign in challenge page:'
+ further_actions: 'If this wasn''t you, please change your password and enable two-factor authentication on your account. You can do so here:'
+ subject: Please confirm attempted sign in
+ title: Sign in attempt
warning:
explanation:
disable: While your account is frozen, your account data remains intact, but you cannot perform any actions until it is unlocked.
@@ -1320,11 +1342,14 @@ squeak:
title: Welcome aboard, %{name}!
users:
follow_limit_reached: You cannot follow more than %{limit} people
+ generic_access_help_html: Trouble accessing your account? You may get in touch with %{email} for assistance
invalid_email: The e-mail address is invalid
invalid_otp_token: Invalid two-factor code
+ invalid_sign_in_token: Invalid security code
otp_lost_help_html: If you lost access to both, you may get in touch with %{email}
seamless_external_login: You are logged in via an external service, so password and e-mail settings are not available.
signed_in_as: 'Signed in as:'
+ suspicious_sign_in_confirmation: You appear to not have logged in from this device before, and you haven't logged in for a while, so we're sending a security code to your e-mail address to confirm that it's you.
verification:
explanation_html: 'You can verify yourself as the owner of the links in your profile metadata. For that, the linked website must contain a link back to your Mastodon profile. The link back must have a rel="me"
attribute. The text content of the link does not matter. Here is an example:'
verification: Verification