diff --git a/app/javascript/mastodon/locales/dog.json b/app/javascript/mastodon/locales/dog.json
index c65202bfe..cf0dd9cf0 100644
--- a/app/javascript/mastodon/locales/dog.json
+++ b/app/javascript/mastodon/locales/dog.json
@@ -133,7 +133,7 @@
"empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
"empty_column.mutes": "You haven't muted any dogs yet.",
"empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
- "empty_column.public": "There is nothing here! Write something publicly, or manually follow dogs from other instances to fill it up",
+ "empty_column.public": "There is nothing here! Write something publicly, or manually follow dogs from other servers to fill it up",
"follow_request.authorize": "Authorize",
"follow_request.reject": "Reject",
"getting_started.developers": "Developers",
@@ -300,7 +300,7 @@
"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.hint": "The report will be sent to your server 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}",
@@ -369,7 +369,7 @@
"trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
"ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
"upload_area.title": "Drag & drop to upload",
- "upload_button.label": "Add media (JPEG, PNG, GIF, WebM, MP4, MOV)",
+ "upload_button.label": "Add media ({formats})",
"upload_error.limit": "File upload limit exceeded.",
"upload_error.poll": "File upload not allowed with polls.",
"upload_form.description": "Describe for the visually impaired",
diff --git a/app/javascript/mastodon/locales/lion.json b/app/javascript/mastodon/locales/lion.json
index 8e2508b53..71cd8fd0b 100644
--- a/app/javascript/mastodon/locales/lion.json
+++ b/app/javascript/mastodon/locales/lion.json
@@ -133,7 +133,7 @@
"empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
"empty_column.mutes": "You haven't muted any lions yet.",
"empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
- "empty_column.public": "There is nothing here! Write something publicly, or manually follow lions from other instances to fill it up",
+ "empty_column.public": "There is nothing here! Write something publicly, or manually follow lions from other servers to fill it up",
"follow_request.authorize": "Authorize",
"follow_request.reject": "Reject",
"getting_started.developers": "Developers",
@@ -300,7 +300,7 @@
"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.hint": "The report will be sent to your server 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}",
@@ -369,7 +369,7 @@
"trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
"ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
"upload_area.title": "Drag & drop to upload",
- "upload_button.label": "Add media (JPEG, PNG, GIF, WebM, MP4, MOV)",
+ "upload_button.label": "Add media ({formats})",
"upload_error.limit": "File upload limit exceeded.",
"upload_error.poll": "File upload not allowed with polls.",
"upload_form.description": "Describe for the visually impaired",
diff --git a/app/javascript/mastodon/locales/squeak.json b/app/javascript/mastodon/locales/squeak.json
index c0708d35e..9ad5336dd 100644
--- a/app/javascript/mastodon/locales/squeak.json
+++ b/app/javascript/mastodon/locales/squeak.json
@@ -133,7 +133,7 @@
"empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
"empty_column.mutes": "You haven't muted any users yet.",
"empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
- "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other instances to fill it up",
+ "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
"follow_request.authorize": "Authorize",
"follow_request.reject": "Reject",
"getting_started.developers": "Developers",
@@ -300,7 +300,7 @@
"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.hint": "The report will be sent to your server 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}",
@@ -369,7 +369,7 @@
"trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
"ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
"upload_area.title": "Drag & drop to upload",
- "upload_button.label": "Add media (JPEG, PNG, GIF, WebM, MP4, MOV)",
+ "upload_button.label": "Add media ({formats})",
"upload_error.limit": "File upload limit exceeded.",
"upload_error.poll": "File upload not allowed with polls.",
"upload_form.description": "Describe for the visually impaired",
diff --git a/config/locales/devise.dog.yml b/config/locales/devise.dog.yml
index ac20a3c66..512bf4902 100644
--- a/config/locales/devise.dog.yml
+++ b/config/locales/devise.dog.yml
@@ -27,12 +27,12 @@ dog:
title: Verify email address
email_changed:
explanation: 'The email address for your account is being changed to:'
- extra: If you did not change your email, it is likely that someone has gained access to your account. Please change your password immediately or contact the instance admin if you're locked out of your account.
+ extra: If you did not change your email, it is likely that someone has gained access to your account. Please change your password immediately or contact the server admin if you're locked out of your account.
subject: 'Mastodon: Email changed'
title: New email address
password_change:
explanation: The password for your account has been changed.
- extra: If you did not change your password, it is likely that someone has gained access to your account. Please change your password immediately or contact the instance admin if you're locked out of your account.
+ extra: If you did not change your password, it is likely that someone has gained access to your account. Please change your password immediately or contact the server admin if you're locked out of your account.
subject: 'Mastodon: Password changed'
title: Password changed
reconfirmation_instructions:
diff --git a/config/locales/devise.lion.yml b/config/locales/devise.lion.yml
index f7619a2ef..c324bed59 100644
--- a/config/locales/devise.lion.yml
+++ b/config/locales/devise.lion.yml
@@ -27,12 +27,12 @@ lion:
title: Verify email address
email_changed:
explanation: 'The email address for your account is being changed to:'
- extra: If you did not change your email, it is likely that someone has gained access to your account. Please change your password immediately or contact the instance admin if you're locked out of your account.
+ extra: If you did not change your email, it is likely that someone has gained access to your account. Please change your password immediately or contact the server admin if you're locked out of your account.
subject: 'Mastodon: Email changed'
title: New email address
password_change:
explanation: The password for your account has been changed.
- extra: If you did not change your password, it is likely that someone has gained access to your account. Please change your password immediately or contact the instance admin if you're locked out of your account.
+ extra: If you did not change your password, it is likely that someone has gained access to your account. Please change your password immediately or contact the server admin if you're locked out of your account.
subject: 'Mastodon: Password changed'
title: Password changed
reconfirmation_instructions:
diff --git a/config/locales/devise.squeak.yml b/config/locales/devise.squeak.yml
index e00f578b9..2c9b8c5aa 100644
--- a/config/locales/devise.squeak.yml
+++ b/config/locales/devise.squeak.yml
@@ -27,12 +27,12 @@ squeak:
title: Verify email address
email_changed:
explanation: 'The email address for your account is being changed to:'
- extra: If you did not change your email, it is likely that someone has gained access to your account. Please change your password immediately or contact the instance admin if you're locked out of your account.
+ extra: If you did not change your email, it is likely that someone has gained access to your account. Please change your password immediately or contact the server admin if you're locked out of your account.
subject: 'Mastodon: Email changed'
title: New email address
password_change:
explanation: The password for your account has been changed.
- extra: If you did not change your password, it is likely that someone has gained access to your account. Please change your password immediately or contact the instance admin if you're locked out of your account.
+ extra: If you did not change your password, it is likely that someone has gained access to your account. Please change your password immediately or contact the server admin if you're locked out of your account.
subject: 'Mastodon: Password changed'
title: Password changed
reconfirmation_instructions:
diff --git a/config/locales/dog.yml b/config/locales/dog.yml
index ea4ecdac8..636b1ef92 100644
--- a/config/locales/dog.yml
+++ b/config/locales/dog.yml
@@ -294,8 +294,8 @@ dog:
one: One account in the database affected
other: "%{count} accounts in the database affected"
retroactive:
- silence: Unsilence all existing accounts from this domain
- suspend: Unsuspend all existing accounts from this domain
+ silence: Unsilence existing affected accounts from this domain
+ suspend: Unsuspend existing affected accounts from this domain
title: Undo domain block for %{domain}
undo: Undo
undo: Undo domain block
@@ -437,7 +437,7 @@ dog:
desc_html: Show a staff badge on a dog page
title: Show staff badge
site_description:
- desc_html: Introductory paragraph on the frontpage. Describe what makes this Mastodon server special and anything else important. You can use HTML tags, in particular <a>
and <em>
.
+ desc_html: Introductory paragraph on the API. Describe what makes this Mastodon server special and anything else important. You can use HTML tags, in particular <a>
and <em>
.
title: Server description
site_description_extended:
desc_html: A good place for your code of conduct, rules, guidelines and other things that set your server apart. You can use HTML tags
diff --git a/config/locales/doorkeeper.dog.yml b/config/locales/doorkeeper.dog.yml
index 7e556c27f..a660fdd14 100644
--- a/config/locales/doorkeeper.dog.yml
+++ b/config/locales/doorkeeper.dog.yml
@@ -114,6 +114,12 @@ dog:
application:
title: OAuth authorization required
scopes:
+ admin:read: read all data on the server
+ admin:read:accounts: read sensitive information of all accounts
+ admin:read:reports: read sensitive information of all reports and reported accounts
+ admin:write: modify all data on the server
+ admin:write:accounts: perform moderation actions on accounts
+ admin:write:reports: perform moderation actions on reports
follow: modify account relationships
push: receive your push notifications
read: read all your account's data
diff --git a/config/locales/doorkeeper.lion.yml b/config/locales/doorkeeper.lion.yml
index 593c9c185..667342c5f 100644
--- a/config/locales/doorkeeper.lion.yml
+++ b/config/locales/doorkeeper.lion.yml
@@ -114,6 +114,12 @@ lion:
application:
title: OAuth authorization required
scopes:
+ admin:read: read all data on the server
+ admin:read:accounts: read sensitive information of all accounts
+ admin:read:reports: read sensitive information of all reports and reported accounts
+ admin:write: modify all data on the server
+ admin:write:accounts: perform moderation actions on accounts
+ admin:write:reports: perform moderation actions on reports
follow: modify account relationships
push: receive your push notifications
read: read all your account's data
diff --git a/config/locales/doorkeeper.squeak.yml b/config/locales/doorkeeper.squeak.yml
index c3487036a..b410226cb 100644
--- a/config/locales/doorkeeper.squeak.yml
+++ b/config/locales/doorkeeper.squeak.yml
@@ -114,6 +114,12 @@ squeak:
application:
title: OAuth authorization required
scopes:
+ admin:read: read all data on the server
+ admin:read:accounts: read sensitive information of all accounts
+ admin:read:reports: read sensitive information of all reports and reported accounts
+ admin:write: modify all data on the server
+ admin:write:accounts: perform moderation actions on accounts
+ admin:write:reports: perform moderation actions on reports
follow: modify account relationships
push: receive your push notifications
read: read all your account's data
diff --git a/config/locales/lion.yml b/config/locales/lion.yml
index 4a2524396..1fa61f381 100644
--- a/config/locales/lion.yml
+++ b/config/locales/lion.yml
@@ -294,8 +294,8 @@ lion:
one: One account in the database affected
other: "%{count} accounts in the database affected"
retroactive:
- silence: Unsilence all existing accounts from this domain
- suspend: Unsuspend all existing accounts from this domain
+ silence: Unsilence existing affected accounts from this domain
+ suspend: Unsuspend existing affected accounts from this domain
title: Undo domain block for %{domain}
undo: Undo
undo: Undo domain block
@@ -437,7 +437,7 @@ lion:
desc_html: Show a staff badge on a lion page
title: Show staff badge
site_description:
- desc_html: Introductory paragraph on the frontpage. Describe what makes this Mastodon server special and anything else important. You can use HTML tags, in particular <a>
and <em>
.
+ desc_html: Introductory paragraph on the API. Describe what makes this Mastodon server special and anything else important. You can use HTML tags, in particular <a>
and <em>
.
title: Server description
site_description_extended:
desc_html: A good place for your code of conduct, rules, guidelines and other things that set your server apart. You can use HTML tags
diff --git a/config/locales/simple_form.dog.yml b/config/locales/simple_form.dog.yml
index b29e88161..b9ceb104f 100644
--- a/config/locales/simple_form.dog.yml
+++ b/config/locales/simple_form.dog.yml
@@ -27,7 +27,7 @@ dog:
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_aggregate_reblogs: Do not show new awoos for toots that have been recently awooed (only affects newly-received awoos)
- setting_default_language: The language of your toots can be detected automatically, but it's not always accurate
+ setting_default_sensitive: Sensitive media is hidden by default and can be revealed with a click
setting_display_media_default: Hide media marked as sensitive
setting_display_media_hide_all: Always hide all media
setting_display_media_show_all: Always show media marked as sensitive
@@ -94,7 +94,7 @@ dog:
setting_auto_play_gif: Auto-play animated GIFs
setting_boost_modal: Show confirmation dialog before awooing
setting_default_language: Posting language
- setting_default_privacy: Post privacy
+ setting_default_privacy: Posting privacy
setting_default_sensitive: Always mark media as sensitive
setting_delete_modal: Show confirmation dialog before deleting a toot
setting_display_media: Media display
diff --git a/config/locales/simple_form.lion.yml b/config/locales/simple_form.lion.yml
index 14ee7e556..d672b3f51 100644
--- a/config/locales/simple_form.lion.yml
+++ b/config/locales/simple_form.lion.yml
@@ -27,7 +27,7 @@ lion:
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_aggregate_reblogs: Do not show new roars for toots that have been recently roared (only affects newly-received roars)
- setting_default_language: The language of your toots can be detected automatically, but it's not always accurate
+ setting_default_sensitive: Sensitive media is hidden by default and can be revealed with a click
setting_display_media_default: Hide media marked as sensitive
setting_display_media_hide_all: Always hide all media
setting_display_media_show_all: Always show media marked as sensitive
@@ -94,7 +94,7 @@ lion:
setting_auto_play_gif: Auto-play animated GIFs
setting_boost_modal: Show confirmation dialog before roaring
setting_default_language: Posting language
- setting_default_privacy: Post privacy
+ setting_default_privacy: Posting privacy
setting_default_sensitive: Always mark media as sensitive
setting_delete_modal: Show confirmation dialog before deleting a toot
setting_display_media: Media display
diff --git a/config/locales/simple_form.squeak.yml b/config/locales/simple_form.squeak.yml
index 965225a8e..0740988c7 100644
--- a/config/locales/simple_form.squeak.yml
+++ b/config/locales/simple_form.squeak.yml
@@ -94,7 +94,7 @@ squeak:
setting_auto_play_gif: Auto-play animated GIFs
setting_boost_modal: Show confirmation dialog before pumping
setting_default_language: Posting language
- setting_default_privacy: Post privacy
+ setting_default_privacy: Posting privacy
setting_default_sensitive: Always mark media as sensitive
setting_delete_modal: Show confirmation dialog before deleting a toot
setting_display_media: Media display