diff --git a/app/javascript/mastodon/locales/dog.json b/app/javascript/mastodon/locales/dog.json
index e857e40791..153f0a954e 100644
--- a/app/javascript/mastodon/locales/dog.json
+++ b/app/javascript/mastodon/locales/dog.json
@@ -1,7 +1,9 @@
{
"account.block": "Block @{name}",
"account.block_domain": "Hide everything from {domain}",
+ "account.blocked": "Blocked",
"account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
+ "account.domain_blocked": "Domain hidden",
"account.edit_profile": "Edit profile",
"account.follow": "Join Pack",
"account.followers": "Pack Members",
@@ -13,7 +15,9 @@
"account.moved_to": "{name} has moved to:",
"account.mute": "Mute @{name}",
"account.mute_notifications": "Mute notifications from @{name}",
+ "account.muted": "Muted",
"account.posts": "Toots",
+ "account.posts_with_replies": "Toots with barks",
"account.report": "Report @{name}",
"account.requested": "Awaiting approval. Click to cancel follow request",
"account.share": "Share @{name}'s profile",
@@ -207,15 +211,22 @@
"relative_time.minutes": "{number}m",
"relative_time.seconds": "{number}s",
"reply_indicator.cancel": "Cancel",
+ "report.forward": "Forward to {target}",
+ "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
+ "report.hint": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",
"report.placeholder": "Additional comments",
"report.submit": "Submit",
"report.target": "Reporting {target}",
"search.placeholder": "Search",
"search_popout.search_format": "Advanced search format",
+ "search_popout.tips.full_text": "Simple text returns statuses you have written, booped, awooed, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
"search_popout.tips.hashtag": "hashtag",
"search_popout.tips.status": "status",
"search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
"search_popout.tips.user": "user",
+ "search_results.accounts": "Dogs",
+ "search_results.hashtags": "Hashtags",
+ "search_results.statuses": "Toots",
"search_results.total": "{count, number} {count, plural, one {result} other {results}}",
"standalone.public_title": "A look inside...",
"status.cannot_reblog": "This toot cannot be awooed",
@@ -235,6 +246,7 @@
"status.reblogged_by": "{name} awooed",
"status.reply": "Bark",
"status.replyAll": "Bark at thread",
+ "status.replyAll": "Bark in thread",
"status.report": "Report @{name}",
"status.sensitive_toggle": "Click to view",
"status.sensitive_warning": "Sensitive content",
@@ -243,7 +255,6 @@
"status.show_more": "Show more",
"status.unmute_conversation": "Unmute conversation",
"status.unpin": "Unpin from profile",
- "tabs_bar.compose": "Compose",
"tabs_bar.federated_timeline": "Federated",
"tabs_bar.home": "Home",
"tabs_bar.local_timeline": "Local",
@@ -252,6 +263,7 @@
"upload_area.title": "Drag & drop to upload",
"upload_button.label": "Add media",
"upload_form.description": "Describe for the visually impaired",
+ "upload_form.focus": "Crop",
"upload_form.undo": "Undo",
"upload_progress.label": "Uploading...",
"video.close": "Close video",
diff --git a/app/javascript/mastodon/locales/lion.json b/app/javascript/mastodon/locales/lion.json
index b45e873be0..281fe7eee4 100644
--- a/app/javascript/mastodon/locales/lion.json
+++ b/app/javascript/mastodon/locales/lion.json
@@ -1,7 +1,9 @@
{
"account.block": "Block @{name}",
"account.block_domain": "Hide everything from {domain}",
+ "account.blocked": "Blocked",
"account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
+ "account.domain_blocked": "Domain hidden",
"account.edit_profile": "Edit profile",
"account.follow": "Join pride",
"account.followers": "Pride Members",
@@ -13,7 +15,9 @@
"account.moved_to": "{name} has moved to:",
"account.mute": "Mute @{name}",
"account.mute_notifications": "Mute notifications from @{name}",
+ "account.muted": "Muted",
"account.posts": "Toots",
+ "account.posts_with_replies": "Toots with meows",
"account.report": "Report @{name}",
"account.requested": "Awaiting approval. Click to cancel follow request",
"account.share": "Share @{name}'s profile",
@@ -207,15 +211,22 @@
"relative_time.minutes": "{number}m",
"relative_time.seconds": "{number}s",
"reply_indicator.cancel": "Cancel",
+ "report.forward": "Forward to {target}",
+ "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
+ "report.hint": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",
"report.placeholder": "Additional comments",
"report.submit": "Submit",
"report.target": "Reporting {target}",
"search.placeholder": "Search",
"search_popout.search_format": "Advanced search format",
+ "search_popout.tips.full_text": "Simple text returns statuses you have written, booped, roard, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
"search_popout.tips.hashtag": "hashtag",
"search_popout.tips.status": "status",
"search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
"search_popout.tips.user": "user",
+ "search_results.accounts": "Lions",
+ "search_results.hashtags": "Hashtags",
+ "search_results.statuses": "Toots",
"search_results.total": "{count, number} {count, plural, one {result} other {results}}",
"standalone.public_title": "A look inside...",
"status.cannot_reblog": "This toot cannot be roared",
@@ -235,6 +246,7 @@
"status.reblogged_by": "{name} roared",
"status.reply": "Meow",
"status.replyAll": "Meow at thread",
+ "status.replyAll": "Reply to thread",
"status.report": "Report @{name}",
"status.sensitive_toggle": "Click to view",
"status.sensitive_warning": "Sensitive content",
@@ -243,7 +255,6 @@
"status.show_more": "Show more",
"status.unmute_conversation": "Unmute conversation",
"status.unpin": "Unpin from profile",
- "tabs_bar.compose": "Compose",
"tabs_bar.federated_timeline": "Federated",
"tabs_bar.home": "Home",
"tabs_bar.local_timeline": "Local",
@@ -252,6 +263,7 @@
"upload_area.title": "Drag & drop to upload",
"upload_button.label": "Add media",
"upload_form.description": "Describe for the visually impaired",
+ "upload_form.focus": "Crop",
"upload_form.undo": "Undo",
"upload_progress.label": "Uploading...",
"video.close": "Close video",
diff --git a/config/locales/dog.yml b/config/locales/dog.yml
index 1c493a64a6..4c7fcefbbb 100644
--- a/config/locales/dog.yml
+++ b/config/locales/dog.yml
@@ -23,7 +23,6 @@ dog:
real_conversation_title: Built for real conversation
within_reach_body: Multiple apps for iOS, Android, and other platforms thanks to a developer-friendly API ecosystem allow you to keep up with your friends anywhere.
within_reach_title: Always within reach
- find_another_instance: Find another instance
generic_description: "%{domain} is one server in the network"
hosted_on: Mastodon hosted on %{domain}
learn_more: Learn more
@@ -274,6 +273,9 @@ dog:
contact_information:
email: Business e-mail
username: Contact username
+ hero:
+ desc_html: Displayed on the frontpage. At least 600x100px recommended. When not set, falls back to instance thumbnail
+ title: Hero image
peers_api_enabled:
desc_html: Domain names this instance has encountered in the fediverse
title: Publish list of discovered instances
@@ -290,6 +292,9 @@ dog:
open:
desc_html: Allow anyone to create an account
title: Open registration
+ show_known_fediverse_at_about_page:
+ desc_html: When toggled, it will show toots from all the known fediverse on preview. Otherwise it will only show local toots.
+ title: Show known fediverse on timeline preview
show_staff_badge:
desc_html: Show a staff badge on a user page
title: Show staff badge
@@ -354,7 +359,8 @@ dog:
your_token: Your access token
auth:
agreement_html: By signing up you agree to follow the rules of the instance and our terms of service.
- change_password: Security
+ change_password: Password
+ confirm_email: Confirm email
delete_account: Delete account
delete_account_html: If you wish to delete your account, you can proceed here. You will be asked for confirmation.
didnt_get_confirmation: Didn't receive confirmation instructions?
@@ -364,9 +370,16 @@ dog:
logout: Logout
migrate_account: Move to a different account
migrate_account_html: If you wish to redirect this account to a different one, you can configure it here.
+ or: or
+ or_log_in_with: Or log in with
+ providers:
+ cas: CAS
+ saml: SAML
register: Sign up
+ register_elsewhere: Sign up on another server
resend_confirmation: Resend confirmation instructions
reset_password: Reset password
+ security: Security
set_new_password: Set new password
authorize_follow:
error: Unfortunately, there was an error looking up the remote account
@@ -413,6 +426,13 @@ dog:
title: This page is not correct
noscript_html: To use the Mastodon web application, please enable JavaScript. Alternatively, try one of the native apps for Mastodon for your platform.
exports:
+ archive_takeout:
+ date: Date
+ download: Download your archive
+ hint_html: You can request an archive of your toots and uploaded media. The exported data will be in ActivityPub format, readable by any compliant software.
+ in_progress: Compiling your archive...
+ request: Request your archive
+ size: Size
blocks: You block
csv: CSV
follows: You follow
@@ -528,7 +548,9 @@ dog:
trillion: T
unit: ''
pagination:
+ newer: Newer
next: Next
+ older: Older
prev: Prev
truncate: "…"
preferences:
@@ -726,6 +748,10 @@ dog:
setup: Set up
wrong_code: The entered code was invalid! Are server time and device time correct?
user_mailer:
+ backup_ready:
+ 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
welcome:
edit_profile_action: Setup profile
edit_profile_step: You can customize your profile by uploading an avatar, header, changing your display name and more. If you’d like to review new followers before they’re allowed to follow you, you can lock your account.
@@ -747,4 +773,5 @@ dog:
users:
invalid_email: The e-mail address is invalid
invalid_otp_token: Invalid two-factor code
+ 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:'
diff --git a/config/locales/lion.yml b/config/locales/lion.yml
index 8a43de79d4..b535c7a91a 100644
--- a/config/locales/lion.yml
+++ b/config/locales/lion.yml
@@ -23,7 +23,6 @@ lion:
real_conversation_title: Built for real conversation
within_reach_body: Multiple apps for iOS, Android, and other platforms thanks to a developer-friendly API ecosystem allow you to keep up with your friends anywhere.
within_reach_title: Always within reach
- find_another_instance: Find another instance
generic_description: "%{domain} is one server in the network"
hosted_on: Mastodon hosted on %{domain}
learn_more: Learn more
@@ -274,6 +273,9 @@ lion:
contact_information:
email: Business e-mail
username: Contact username
+ hero:
+ desc_html: Displayed on the frontpage. At least 600x100px recommended. When not set, falls back to instance thumbnail
+ title: Hero image
peers_api_enabled:
desc_html: Domain names this instance has encountered in the fediverse
title: Publish list of discovered instances
@@ -290,6 +292,9 @@ lion:
open:
desc_html: Allow anyone to create an account
title: Open registration
+ show_known_fediverse_at_about_page:
+ desc_html: When toggled, it will show toots from all the known fediverse on preview. Otherwise it will only show local toots.
+ title: Show known fediverse on timeline preview
show_staff_badge:
desc_html: Show a staff badge on a user page
title: Show staff badge
@@ -354,7 +359,8 @@ lion:
your_token: Your access token
auth:
agreement_html: By signing up you agree to follow the rules of the instance and our terms of service.
- change_password: Security
+ change_password: Password
+ confirm_email: Confirm email
delete_account: Delete account
delete_account_html: If you wish to delete your account, you can proceed here. You will be asked for confirmation.
didnt_get_confirmation: Didn't receive confirmation instructions?
@@ -364,9 +370,16 @@ lion:
logout: Logout
migrate_account: Move to a different account
migrate_account_html: If you wish to redirect this account to a different one, you can configure it here.
+ or: or
+ or_log_in_with: Or log in with
+ providers:
+ cas: CAS
+ saml: SAML
register: Sign up
+ register_elsewhere: Sign up on another server
resend_confirmation: Resend confirmation instructions
reset_password: Reset password
+ security: Security
set_new_password: Set new password
authorize_follow:
error: Unfortunately, there was an error looking up the remote account
@@ -413,6 +426,13 @@ lion:
title: This page is not correct
noscript_html: To use the Mastodon web application, please enable JavaScript. Alternatively, try one of the native apps for Mastodon for your platform.
exports:
+ archive_takeout:
+ date: Date
+ download: Download your archive
+ hint_html: You can request an archive of your toots and uploaded media. The exported data will be in ActivityPub format, readable by any compliant software.
+ in_progress: Compiling your archive...
+ request: Request your archive
+ size: Size
blocks: You block
csv: CSV
follows: You follow
@@ -528,7 +548,9 @@ lion:
trillion: T
unit: ''
pagination:
+ newer: Newer
next: Next
+ older: Older
prev: Prev
truncate: "…"
preferences:
@@ -726,6 +748,10 @@ lion:
setup: Set up
wrong_code: The entered code was invalid! Are server time and device time correct?
user_mailer:
+ backup_ready:
+ 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
welcome:
edit_profile_action: Setup profile
edit_profile_step: You can customize your profile by uploading an avatar, header, changing your display name and more. If you’d like to review new followers before they’re allowed to follow you, you can lock your account.
@@ -747,4 +773,5 @@ lion:
users:
invalid_email: The e-mail address is invalid
invalid_otp_token: Invalid two-factor code
+ 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:'
diff --git a/config/locales/simple_form.dog.yml b/config/locales/simple_form.dog.yml
index 457b1a2d14..15e4adb8ef 100644
--- a/config/locales/simple_form.dog.yml
+++ b/config/locales/simple_form.dog.yml
@@ -45,6 +45,7 @@ dog:
setting_default_privacy: Post privacy
setting_default_sensitive: Always mark media as sensitive
setting_delete_modal: Show confirmation dialog before deleting a toot
+ setting_display_sensitive_media: Always show media marked as sensitive
setting_noindex: Opt-out of search engine indexing
setting_reduce_motion: Reduce motion in animations
setting_system_font_ui: Use system's default font
@@ -53,6 +54,7 @@ dog:
severity: Severity
type: Import type
username: Username
+ username_or_email: Username or Email
interactions:
must_be_follower: Block notifications from non-followers
must_be_following: Block notifications from people you don't follow
diff --git a/config/locales/simple_form.lion.yml b/config/locales/simple_form.lion.yml
index f873d284ec..be67f95952 100644
--- a/config/locales/simple_form.lion.yml
+++ b/config/locales/simple_form.lion.yml
@@ -45,6 +45,7 @@ lion:
setting_default_privacy: Post privacy
setting_default_sensitive: Always mark media as sensitive
setting_delete_modal: Show confirmation dialog before deleting a toot
+ setting_display_sensitive_media: Always show media marked as sensitive
setting_noindex: Opt-out of search engine indexing
setting_reduce_motion: Reduce motion in animations
setting_system_font_ui: Use system's default font
@@ -53,6 +54,7 @@ lion:
severity: Severity
type: Import type
username: Username
+ username_or_email: Username or Email
interactions:
must_be_follower: Block notifications from non-followers
must_be_following: Block notifications from people you don't follow