diff --git a/templates/components/domain_sub.html.twig b/templates/components/domain_sub.html.twig index a2aef0cd0c..c216d58676 100644 --- a/templates/components/domain_sub.html.twig +++ b/templates/components/domain_sub.html.twig @@ -9,8 +9,13 @@ method="post">
diff --git a/tests/Functional/Controller/Domain/DomainSubControllerTest.php b/tests/Functional/Controller/Domain/DomainSubControllerTest.php index d5727e8525..bdfa7ddfa0 100644 --- a/tests/Functional/Controller/Domain/DomainSubControllerTest.php +++ b/tests/Functional/Controller/Domain/DomainSubControllerTest.php @@ -22,19 +22,19 @@ public function testUserCanSubAndUnsubDomain(): void $crawler = $this->client->request('GET', '/d/kbin.pub'); // Subscribe - $this->client->submit($crawler->filter('#sidebar .domain')->selectButton('Subscribe')->form()); + $this->client->submit($crawler->filter('#sidebar .domain')->selectButton('Sub')->form()); $crawler = $this->client->followRedirect(); $this->assertSelectorExists('#sidebar form[name=domain_subscribe] .active'); - $this->assertSelectorTextContains('#sidebar .domain', 'Unsubscribe'); + $this->assertSelectorTextContains('#sidebar .domain', 'Unsub'); $this->assertSelectorTextContains('#sidebar .domain', '1'); // Unsubscribe - $this->client->submit($crawler->filter('#sidebar .domain')->selectButton('Unsubscribe')->form()); + $this->client->submit($crawler->filter('#sidebar .domain')->selectButton('Unsub')->form()); $this->client->followRedirect(); $this->assertSelectorNotExists('#sidebar form[name=domain_subscribe] .active'); - $this->assertSelectorTextContains('#sidebar .domain', 'Subscribe'); + $this->assertSelectorTextContains('#sidebar .domain', 'Sub'); $this->assertSelectorTextContains('#sidebar .domain', '0'); } @@ -53,10 +53,10 @@ public function testXmlUserCanSubDomain(): void // Subscribe $this->client->setServerParameter('HTTP_X-Requested-With', 'XMLHttpRequest'); - $this->client->submit($crawler->filter('#sidebar .domain')->selectButton('Subscribe')->form()); + $this->client->submit($crawler->filter('#sidebar .domain')->selectButton('Sub')->form()); $this->assertStringContainsString('{"html":', $this->client->getResponse()->getContent()); - $this->assertStringContainsString('Unsubscribe', $this->client->getResponse()->getContent()); + $this->assertStringContainsString('Unsub', $this->client->getResponse()->getContent()); } public function testXmlUserCanUnsubDomain(): void @@ -73,14 +73,14 @@ public function testXmlUserCanUnsubDomain(): void $crawler = $this->client->request('GET', '/d/kbin.pub'); // Subscribe - $this->client->submit($crawler->filter('#sidebar .domain')->selectButton('Subscribe')->form()); + $this->client->submit($crawler->filter('#sidebar .domain')->selectButton('Sub')->form()); $crawler = $this->client->followRedirect(); // Unsubscribe $this->client->setServerParameter('HTTP_X-Requested-With', 'XMLHttpRequest'); - $this->client->submit($crawler->filter('#sidebar .domain')->selectButton('Unsubscribe')->form()); + $this->client->submit($crawler->filter('#sidebar .domain')->selectButton('Unsub')->form()); $this->assertStringContainsString('{"html":', $this->client->getResponse()->getContent()); - $this->assertStringContainsString('Subscribe', $this->client->getResponse()->getContent()); + $this->assertStringContainsString('Sub', $this->client->getResponse()->getContent()); } } diff --git a/tests/Functional/Controller/Magazine/MagazineSubControllerTest.php b/tests/Functional/Controller/Magazine/MagazineSubControllerTest.php index a7a6ec7ba6..4c2fc7f2f6 100644 --- a/tests/Functional/Controller/Magazine/MagazineSubControllerTest.php +++ b/tests/Functional/Controller/Magazine/MagazineSubControllerTest.php @@ -17,15 +17,15 @@ public function testUserCanSubAndUnsubMagazine(): void $crawler = $this->client->request('GET', '/m/acme'); // Sub magazine - $this->client->submit($crawler->filter('#sidebar .magazine')->selectButton('Subscribe')->form()); + $this->client->submit($crawler->filter('#sidebar .magazine')->selectButton('Sub')->form()); $crawler = $this->client->followRedirect(); $this->assertSelectorExists('#sidebar form[name=magazine_subscribe] .active'); - $this->assertSelectorTextContains('#sidebar .magazine', 'Unsubscribe'); + $this->assertSelectorTextContains('#sidebar .magazine', 'Unsub'); $this->assertSelectorTextContains('#sidebar .magazine', '2'); // Unsub magazine - $this->client->submit($crawler->filter('#sidebar .magazine')->selectButton('Unsubscribe')->form()); + $this->client->submit($crawler->filter('#sidebar .magazine')->selectButton('Unsub')->form()); $this->client->followRedirect(); $this->assertSelectorTextContains('#sidebar .magazine', '1'); } @@ -39,10 +39,10 @@ public function testXmlUserCanSubMagazine(): void $crawler = $this->client->request('GET', '/m/acme'); $this->client->setServerParameter('HTTP_X-Requested-With', 'XMLHttpRequest'); - $this->client->submit($crawler->filter('#sidebar .magazine')->selectButton('Subscribe')->form()); + $this->client->submit($crawler->filter('#sidebar .magazine')->selectButton('Sub')->form()); $this->assertStringContainsString('{"html":', $this->client->getResponse()->getContent()); - $this->assertStringContainsString('Unsubscribe', $this->client->getResponse()->getContent()); + $this->assertStringContainsString('Unsub', $this->client->getResponse()->getContent()); } public function testXmlUserCanUnsubMagazine(): void @@ -54,14 +54,14 @@ public function testXmlUserCanUnsubMagazine(): void $crawler = $this->client->request('GET', '/m/acme'); // Sub magazine - $this->client->submit($crawler->filter('#sidebar .magazine')->selectButton('Subscribe')->form()); + $this->client->submit($crawler->filter('#sidebar .magazine')->selectButton('Sub')->form()); $crawler = $this->client->followRedirect(); // Unsub magazine $this->client->setServerParameter('HTTP_X-Requested-With', 'XMLHttpRequest'); - $this->client->submit($crawler->filter('#sidebar .magazine')->selectButton('Unsubscribe')->form()); + $this->client->submit($crawler->filter('#sidebar .magazine')->selectButton('Unsub')->form()); $this->assertStringContainsString('{"html":', $this->client->getResponse()->getContent()); - $this->assertStringContainsString('Subscribe', $this->client->getResponse()->getContent()); + $this->assertStringContainsString('Sub', $this->client->getResponse()->getContent()); } } diff --git a/translations/messages.en.yaml b/translations/messages.en.yaml index 7c06805e67..edd6e0a425 100644 --- a/translations/messages.en.yaml +++ b/translations/messages.en.yaml @@ -62,18 +62,20 @@ activity: Activity cover: Cover related_posts: Related posts random_posts: Random posts -federated_magazine_info: This magazine is from a federated server and may be +federated_magazine_info: This magazine is from a federated server and may be incomplete. -disconnected_magazine_info: This magazine is not receiving updates (last +disconnected_magazine_info: This magazine is not receiving updates (last activity %days% day(s) ago). always_disconnected_magazine_info: This magazine is not receiving updates. subscribe_for_updates: Subscribe to start receiving updates. -federated_user_info: This profile is from a federated server and may be +federated_user_info: This profile is from a federated server and may be incomplete. go_to_original_instance: View on remote instance empty: Empty subscribe: Subscribe +subscribe_short: Sub unsubscribe: Unsubscribe +unsubscribe_short: Unsub follow: Follow unfollow: Unfollow reply: Reply @@ -92,7 +94,7 @@ from: from username: Username email: Email repeat_password: Repeat password -agree_terms: Consent to %terms_link_start%Terms and Conditions%terms_link_end% +agree_terms: Consent to %terms_link_start%Terms and Conditions%terms_link_end% and %policy_link_start%Privacy Policy%policy_link_end% terms: Terms of service privacy_policy: Privacy policy @@ -118,10 +120,10 @@ enabled: Enabled useful: Useful help: Help check_email: Check your email -reset_check_email_desc: If there is already an account associated with your - email address, you should receive an email shortly containing a link that you +reset_check_email_desc: If there is already an account associated with your + email address, you should receive an email shortly containing a link that you can use to reset your password. This link will expire in %expire%. -reset_check_email_desc2: If you don't receive an email please check your spam +reset_check_email_desc2: If you don't receive an email please check your spam folder. try_again: Try again up_vote: Boost @@ -217,7 +219,7 @@ notify_on_new_entry_reply: Any level comments in threads I authored notify_on_new_entry_comment_reply: Replies to my comments in any threads notify_on_new_post_reply: Any level replies to posts I authored notify_on_new_post_comment_reply: Replies to my comments on any posts -notify_on_new_entry: New threads (links or articles) in any magazine to which +notify_on_new_entry: New threads (links or articles) in any magazine to which I'm subscribed notify_on_new_posts: New posts in any magazine to which I'm subscribed notify_on_user_signup: New signups @@ -266,13 +268,13 @@ show_all: Show all flash_register_success: Welcome aboard! Your account is now registered. One last step - check your inbox for an activation link that will bring your account to life. -flash_thread_new_success: The thread has been created successfully and is now +flash_thread_new_success: The thread has been created successfully and is now visible to other users. flash_thread_edit_success: The thread has been successfully edited. flash_thread_delete_success: The thread has been successfully deleted. flash_thread_pin_success: The thread has been successfully pinned. flash_thread_unpin_success: The thread has been successfully unpinned. -flash_magazine_new_success: The magazine has been created successfully. You can +flash_magazine_new_success: The magazine has been created successfully. You can now add new content or explore the magazine's administration panel. flash_magazine_edit_success: The magazine has been successfully edited. flash_mark_as_adult_success: The post has been successfully marked as NSFW. @@ -280,9 +282,9 @@ flash_unmark_as_adult_success: The post has been successfully unmarked as NSFW. too_many_requests: Limit exceeded, please try again later. set_magazines_bar: Magazines bar set_magazines_bar_desc: add the magazine names after the comma -set_magazines_bar_empty_desc: if the field is empty, active magazines are +set_magazines_bar_empty_desc: if the field is empty, active magazines are displayed on the bar. -mod_log_alert: WARNING - The Modlog may contain unpleasant or distressing +mod_log_alert: WARNING - The Modlog may contain unpleasant or distressing content that has been removed by moderators. Please exercise caution. added_new_thread: Added a new thread edited_thread: Edited a thread @@ -327,10 +329,10 @@ approve: Approve ban: Ban unban: Unban ban_hashtag_btn: Ban Hashtag -ban_hashtag_description: Banning a hashtag will stop posts with this hashtag +ban_hashtag_description: Banning a hashtag will stop posts with this hashtag from being created, as well as hiding existing posts with this hashtag. unban_hashtag_btn: Unban Hashtag -unban_hashtag_description: Unbanning a hashtag will allow creating posts with +unban_hashtag_description: Unbanning a hashtag will allow creating posts with this hashtag again. Existing posts with this hashtag are no longer hidden. filters: Filters approved: Approved @@ -405,15 +407,15 @@ auto_preview: Auto media preview dynamic_lists: Dynamic lists banned_instances: Banned instances kbin_intro_title: Explore the Fediverse -kbin_intro_desc: is a decentralized platform for content aggregation and +kbin_intro_desc: is a decentralized platform for content aggregation and microblogging that operates within the Fediverse network. kbin_promo_title: Create your own instance kbin_promo_desc: '%link_start%Clone repo%link_end% and develop fediverse' captcha_enabled: Captcha enabled header_logo: Header logo -browsing_one_thread: You are only browsing one thread in the discussion! All +browsing_one_thread: You are only browsing one thread in the discussion! All comments are available on the post page. -viewing_one_signup_request: You are only viewing one signup request by +viewing_one_signup_request: You are only viewing one signup request by %username% return: Return boost: Boost @@ -421,7 +423,7 @@ mercure_enabled: Mercure enabled report_issue: Report issue tokyo_night: Tokyo Night preferred_languages: Filter languages of threads and posts -infinite_scroll_help: Automatically load more content when you reach the bottom +infinite_scroll_help: Automatically load more content when you reach the bottom of the page. sticky_navbar_help: The navbar will stick to the top of the page when you scroll down. @@ -448,12 +450,12 @@ bot_body_content: "Welcome to the Mbin Agent! This agent plays a crucial role in users, and engage in social interactions such as liking, sharing, and commenting on threads or posts." password_confirm_header: Confirm your password change request. -your_account_is_not_active: Your account has not been activated. Please check - your email for account activation instructions or request a new account activation email. your_account_has_been_banned: Your account has been banned -your_account_is_not_yet_approved: Your account has not been approved yet. We - will send you an email as soon as the admins have processed your signup +your_account_is_not_yet_approved: Your account has not been approved yet. We + will send you an email as soon as the admins have processed your signup request. toolbar.bold: Bold toolbar.italic: Italic @@ -472,21 +474,21 @@ federation_page_enabled: Federation page enabled federation_page_allowed_description: Known instances we federate with federation_page_disallowed_description: Instances we do not federate with federation_page_dead_title: Dead instances -federation_page_dead_description: Instances that we could not deliver at least +federation_page_dead_description: Instances that we could not deliver at least 10 activities in a row and where the last successful deliver and -receive were more than a week ago federated_search_only_loggedin: Federated search limited if not logged in account_deletion_title: Account deletion account_deletion_description: Your account will be deleted in 30 days unless you - choose to delete the account immediately. To restore your account within 30 + choose to delete the account immediately. To restore your account within 30 days, login with the same user credentials or contact an administrator. account_deletion_button: Delete Account account_deletion_immediate: Delete immediately more_from_domain: More from domain errors.server500.title: 500 Internal Server Error -errors.server500.description: Sorry, something went wrong on our end. If you - continue to see this error, try contacting the instance owner. If this - instance is not working at all, check out %link_start%other Mbin +errors.server500.description: Sorry, something went wrong on our end. If you + continue to see this error, try contacting the instance owner. If this + instance is not working at all, check out %link_start%other Mbin instances%link_end% in the meanwhile until the problem is resolved. errors.server429.title: 429 Too Many Requests errors.server404.title: 404 Not found @@ -499,97 +501,97 @@ email.delete.description: The following user has requested that their account be deleted resend_account_activation_email_question: Inactive account? resend_account_activation_email: Re-send account activation email -resend_account_activation_email_error: There was an issue submitting this - request. There may be no account associated with that email or perhaps it is +resend_account_activation_email_error: There was an issue submitting this + request. There may be no account associated with that email or perhaps it is already activated. -resend_account_activation_email_success: If an account associated with that +resend_account_activation_email_success: If an account associated with that email exists, we will send out a new activation email. -resend_account_activation_email_description: Enter the email address associated +resend_account_activation_email_description: Enter the email address associated with your account. We will send out another activation email for you. custom_css: Custom CSS ignore_magazines_custom_css: Ignore magazines custom CSS oauth.consent.title: OAuth2 Consent Form oauth.consent.grant_permissions: Grant Permissions -oauth.consent.app_requesting_permissions: would like to perform the following +oauth.consent.app_requesting_permissions: would like to perform the following actions on your behalf oauth.consent.app_has_permissions: can already perform the following actions -oauth.consent.to_allow_access: To allow this access, click the 'Allow' button +oauth.consent.to_allow_access: To allow this access, click the 'Allow' button below oauth.consent.allow: Allow oauth.consent.deny: Deny oauth.client_identifier.invalid: Invalid OAuth Client ID! -oauth.client_not_granted_message_read_permission: This app has not received +oauth.client_not_granted_message_read_permission: This app has not received permission to read your messages. restrict_oauth_clients: Restrict OAuth2 Client creation to Admins private_instance: Force users to login before they can access any content block: Block unblock: Unblock -oauth2.grant.moderate.magazine.ban.delete: Unban users in your moderated +oauth2.grant.moderate.magazine.ban.delete: Unban users in your moderated magazines. oauth2.grant.moderate.magazine.list: Read a list of your moderated magazines. -oauth2.grant.moderate.magazine.reports.all: Manage reports in your moderated +oauth2.grant.moderate.magazine.reports.all: Manage reports in your moderated magazines. -oauth2.grant.moderate.magazine.reports.read: Read reports in your moderated +oauth2.grant.moderate.magazine.reports.read: Read reports in your moderated magazines. -oauth2.grant.moderate.magazine.reports.action: Accept or reject reports in your +oauth2.grant.moderate.magazine.reports.action: Accept or reject reports in your moderated magazines. -oauth2.grant.moderate.magazine.trash.read: View trashed content in your +oauth2.grant.moderate.magazine.trash.read: View trashed content in your moderated magazines. -oauth2.grant.moderate.magazine_admin.all: Create, edit, or delete your owned +oauth2.grant.moderate.magazine_admin.all: Create, edit, or delete your owned magazines. oauth2.grant.moderate.magazine_admin.create: Create new magazines. oauth2.grant.moderate.magazine_admin.delete: Delete any of your owned magazines. -oauth2.grant.moderate.magazine_admin.update: Edit any of your owned magazines' +oauth2.grant.moderate.magazine_admin.update: Edit any of your owned magazines' rules, description, NSFW status, or icon. -oauth2.grant.moderate.magazine_admin.edit_theme: Edit the custom CSS of any of +oauth2.grant.moderate.magazine_admin.edit_theme: Edit the custom CSS of any of your owned magazines. oauth2.grant.moderate.magazine_admin.moderators: Add or remove moderators of any of your owned magazines. -oauth2.grant.moderate.magazine_admin.badges: Create or remove badges from your +oauth2.grant.moderate.magazine_admin.badges: Create or remove badges from your owned magazines. oauth2.grant.moderate.magazine_admin.tags: Create or remove tags from your owned magazines. -oauth2.grant.moderate.magazine_admin.stats: View the content, vote, and view +oauth2.grant.moderate.magazine_admin.stats: View the content, vote, and view stats of your owned magazines. oauth2.grant.admin.all: Perform any administrative action on your instance. oauth2.grant.admin.entry.purge: Completely delete any thread from your instance. oauth2.grant.read.general: Read all content you have access to. -oauth2.grant.write.general: Create or edit any of your threads, posts, or +oauth2.grant.write.general: Create or edit any of your threads, posts, or comments. oauth2.grant.delete.general: Delete any of your threads, posts, or comments. oauth2.grant.report.general: Report threads, posts, or comments. -oauth2.grant.vote.general: Upvote, downvote, or boost threads, posts, or +oauth2.grant.vote.general: Upvote, downvote, or boost threads, posts, or comments. -oauth2.grant.subscribe.general: Subscribe or follow any magazine, domain, or +oauth2.grant.subscribe.general: Subscribe or follow any magazine, domain, or user, and view the magazines, domains, and users you subscribe to. -oauth2.grant.block.general: Block or unblock any magazine, domain, or user, and +oauth2.grant.block.general: Block or unblock any magazine, domain, or user, and view the magazines, domains, and users you have blocked. oauth2.grant.domain.all: Subscribe to or block domains, and view the domains you subscribe to or block. -oauth2.grant.domain.subscribe: Subscribe or unsubscribe to domains and view the +oauth2.grant.domain.subscribe: Subscribe or unsubscribe to domains and view the domains you subscribe to. -oauth2.grant.domain.block: Block or unblock domains and view the domains you +oauth2.grant.domain.block: Block or unblock domains and view the domains you have blocked. -oauth2.grant.entry.all: Create, edit, or delete your threads, and vote, boost, +oauth2.grant.entry.all: Create, edit, or delete your threads, and vote, boost, or report any thread. oauth2.grant.entry.create: Create new threads. oauth2.grant.entry.edit: Edit your existing threads. oauth2.grant.entry.delete: Delete your existing threads. oauth2.grant.entry.vote: Upvote, boost, or downvote any thread. oauth2.grant.entry.report: Report any thread. -oauth2.grant.entry_comment.all: Create, edit, or delete your comments in +oauth2.grant.entry_comment.all: Create, edit, or delete your comments in threads, and vote, boost, or report any comment in a thread. oauth2.grant.entry_comment.create: Create new comments in threads. oauth2.grant.entry_comment.edit: Edit your existing comments in threads. oauth2.grant.entry_comment.delete: Delete your existing comments in threads. -oauth2.grant.entry_comment.vote: Upvote, boost, or downvote any comment in a +oauth2.grant.entry_comment.vote: Upvote, boost, or downvote any comment in a thread. oauth2.grant.entry_comment.report: Report any comment in a thread. -oauth2.grant.magazine.all: Subscribe to or block magazines, and view the +oauth2.grant.magazine.all: Subscribe to or block magazines, and view the magazines you subscribe to or block. -oauth2.grant.magazine.subscribe: Subscribe or unsubscribe to magazines and view +oauth2.grant.magazine.subscribe: Subscribe or unsubscribe to magazines and view the magazines you subscribe to. -oauth2.grant.magazine.block: Block or unblock magazines and view the magazines +oauth2.grant.magazine.block: Block or unblock magazines and view the magazines you have blocked. oauth2.grant.post.all: Create, edit, or delete your microblogs, and vote, boost, or report any microblog. @@ -598,16 +600,16 @@ oauth2.grant.post.edit: Edit your existing posts. oauth2.grant.post.delete: Delete your existing posts. oauth2.grant.post.vote: Upvote, boost, or downvote any post. oauth2.grant.post.report: Report any post. -oauth2.grant.post_comment.all: Create, edit, or delete your comments on posts, +oauth2.grant.post_comment.all: Create, edit, or delete your comments on posts, and vote, boost, or report any comment on a post. oauth2.grant.post_comment.create: Create new comments on posts. oauth2.grant.post_comment.edit: Edit your existing comments on posts. oauth2.grant.post_comment.delete: Delete your existing comments on posts. -oauth2.grant.post_comment.vote: Upvote, boost, or downvote any comment on a +oauth2.grant.post_comment.vote: Upvote, boost, or downvote any comment on a post. oauth2.grant.post_comment.report: Report any comment on a post. -oauth2.grant.user.all: Read and edit your profile, messages, or notifications; - Read and edit permissions you've granted other apps; follow or block other +oauth2.grant.user.all: Read and edit your profile, messages, or notifications; + Read and edit permissions you've granted other apps; follow or block other users; view lists of users you follow or block. oauth2.grant.user.bookmark: Add and remove bookmarks oauth2.grant.user.bookmark.add: Add bookmarks @@ -619,44 +621,44 @@ oauth2.grant.user.bookmark_list.delete: Delete your bookmark lists oauth2.grant.user.profile.all: Read and edit your profile. oauth2.grant.user.profile.read: Read your profile. oauth2.grant.user.profile.edit: Edit your profile. -oauth2.grant.user.message.all: Read your messages and send messages to other +oauth2.grant.user.message.all: Read your messages and send messages to other users. oauth2.grant.user.message.read: Read your messages. oauth2.grant.user.message.create: Send messages to other users. oauth2.grant.user.notification.all: Read and clear your notifications. -oauth2.grant.user.notification.read: Read your notifications, including message +oauth2.grant.user.notification.read: Read your notifications, including message notifications. oauth2.grant.user.notification.delete: Clear your notifications. -oauth2.grant.user.oauth_clients.all: Read and edit the permissions you have +oauth2.grant.user.oauth_clients.all: Read and edit the permissions you have granted to other OAuth2 applications. -oauth2.grant.user.oauth_clients.read: Read the permissions you have granted to +oauth2.grant.user.oauth_clients.read: Read the permissions you have granted to other OAuth2 applications. -oauth2.grant.user.oauth_clients.edit: Edit the permissions you have granted to +oauth2.grant.user.oauth_clients.edit: Edit the permissions you have granted to other OAuth2 applications. oauth2.grant.user.follow: Follow or unfollow users, and read a list of users you follow. -oauth2.grant.user.block: Block or unblock users, and read a list of users you +oauth2.grant.user.block: Block or unblock users, and read a list of users you block. -oauth2.grant.moderate.all: Perform any moderation action you have permission to +oauth2.grant.moderate.all: Perform any moderation action you have permission to perform in your moderated magazines. oauth2.grant.moderate.entry.all: Moderate threads in your moderated magazines. -oauth2.grant.moderate.entry.change_language: Change the language of threads in +oauth2.grant.moderate.entry.change_language: Change the language of threads in your moderated magazines. -oauth2.grant.moderate.entry.pin: Pin threads to the top of your moderated +oauth2.grant.moderate.entry.pin: Pin threads to the top of your moderated magazines. oauth2.grant.moderate.entry.lock: Lock threads in your moderated magazines, so no one can comment on it oauth2.grant.moderate.entry.set_adult: Mark threads as NSFW in your moderated magazines. -oauth2.grant.moderate.entry.trash: Trash or restore threads in your moderated +oauth2.grant.moderate.entry.trash: Trash or restore threads in your moderated magazines. -oauth2.grant.moderate.entry_comment.all: Moderate comments in threads in your +oauth2.grant.moderate.entry_comment.all: Moderate comments in threads in your moderated magazines. -oauth2.grant.moderate.entry_comment.change_language: Change the language of +oauth2.grant.moderate.entry_comment.change_language: Change the language of comments in threads in your moderated magazines. -oauth2.grant.moderate.entry_comment.set_adult: Mark comments in threads as NSFW +oauth2.grant.moderate.entry_comment.set_adult: Mark comments in threads as NSFW in your moderated magazines. -oauth2.grant.moderate.entry_comment.trash: Trash or restore comments in threads +oauth2.grant.moderate.entry_comment.trash: Trash or restore comments in threads in your moderated magazines. oauth2.grant.moderate.post.all: Moderate posts in your moderated magazines. oauth2.grant.moderate.post.change_language: Change the language of posts in your @@ -665,57 +667,57 @@ oauth2.grant.moderate.post.lock: Lock microblogs in your moderated magazines, so no one can comment on it oauth2.grant.moderate.post.set_adult: Mark posts as NSFW in your moderated magazines. -oauth2.grant.moderate.post.trash: Trash or restore posts in your moderated +oauth2.grant.moderate.post.trash: Trash or restore posts in your moderated magazines. -oauth2.grant.moderate.post_comment.all: Moderate comments on posts in your +oauth2.grant.moderate.post_comment.all: Moderate comments on posts in your moderated magazines. -oauth2.grant.moderate.post_comment.change_language: Change the language of +oauth2.grant.moderate.post_comment.change_language: Change the language of comments on posts in your moderated magazines. -oauth2.grant.moderate.post_comment.set_adult: Mark comments on posts as NSFW in +oauth2.grant.moderate.post_comment.set_adult: Mark comments on posts as NSFW in your moderated magazines. -oauth2.grant.moderate.post_comment.trash: Trash or restore comments on posts in +oauth2.grant.moderate.post_comment.trash: Trash or restore comments on posts in your moderated magazines. oauth2.grant.moderate.magazine.all: Manage bans, reports, and view trashed items in your moderated magazines. -oauth2.grant.moderate.magazine.ban.all: Manage banned users in your moderated +oauth2.grant.moderate.magazine.ban.all: Manage banned users in your moderated magazines. -oauth2.grant.moderate.magazine.ban.read: View banned users in your moderated +oauth2.grant.moderate.magazine.ban.read: View banned users in your moderated magazines. -oauth2.grant.moderate.magazine.ban.create: Ban users in your moderated +oauth2.grant.moderate.magazine.ban.create: Ban users in your moderated magazines. -oauth2.grant.admin.entry_comment.purge: Completely delete any comment in a +oauth2.grant.admin.entry_comment.purge: Completely delete any comment in a thread from your instance. oauth2.grant.admin.post.purge: Completely delete any post from your instance. -oauth2.grant.admin.post_comment.purge: Completely delete any comment on a post +oauth2.grant.admin.post_comment.purge: Completely delete any comment on a post from your instance. -oauth2.grant.admin.magazine.all: Move threads between or completely delete +oauth2.grant.admin.magazine.all: Move threads between or completely delete magazines on your instance. -oauth2.grant.admin.magazine.move_entry: Move threads between magazines on your +oauth2.grant.admin.magazine.move_entry: Move threads between magazines on your instance. oauth2.grant.admin.magazine.purge: Completely delete magazines on your instance. -oauth2.grant.admin.user.all: Ban, verify, or completely delete users on your +oauth2.grant.admin.user.all: Ban, verify, or completely delete users on your instance. oauth2.grant.admin.user.ban: Ban or unban users from your instance. oauth2.grant.admin.user.verify: Verify users on your instance. oauth2.grant.admin.user.delete: Delete users from your instance. oauth2.grant.admin.user.purge: Completely delete users from your instance. -oauth2.grant.admin.instance.all: View and update instance settings or +oauth2.grant.admin.instance.all: View and update instance settings or information. oauth2.grant.admin.instance.stats: View your instance's stats. -oauth2.grant.admin.instance.settings.all: View or update settings on your +oauth2.grant.admin.instance.settings.all: View or update settings on your instance. oauth2.grant.admin.instance.settings.read: View settings on your instance. oauth2.grant.admin.instance.settings.edit: Update settings on your instance. -oauth2.grant.admin.instance.information.edit: Update the About, FAQ, Contact, +oauth2.grant.admin.instance.information.edit: Update the About, FAQ, Contact, Terms of Service, and Privacy Policy pages on your instance. -oauth2.grant.admin.federation.all: View and update currently defederated +oauth2.grant.admin.federation.all: View and update currently defederated instances. oauth2.grant.admin.federation.read: View the list of defederated instances. -oauth2.grant.admin.federation.update: Add or remove instances to or from the +oauth2.grant.admin.federation.update: Add or remove instances to or from the list of defederated instances. -oauth2.grant.admin.oauth_clients.all: View or revoke OAuth2 clients that exist +oauth2.grant.admin.oauth_clients.all: View or revoke OAuth2 clients that exist on your instance. -oauth2.grant.admin.oauth_clients.read: View the OAuth2 clients that exist on +oauth2.grant.admin.oauth_clients.read: View the OAuth2 clients that exist on your instance, and their usage stats. oauth2.grant.admin.oauth_clients.revoke: Revoke access to OAuth2 clients on your instance. @@ -728,14 +730,14 @@ comment_reply_position_help: Display the comment reply form either at the top or show_avatars_on_comments: Show Comment Avatars single_settings: Single update_comment: Update comment -show_avatars_on_comments_help: Display/hide user avatars when viewing comments +show_avatars_on_comments_help: Display/hide user avatars when viewing comments on a single thread or post. comment_reply_position: Comment reply position -magazine_theme_appearance_custom_css: Custom CSS that will apply when viewing +magazine_theme_appearance_custom_css: Custom CSS that will apply when viewing content within your magazine. magazine_theme_appearance_icon: Custom icon for the magazine. -magazine_theme_appearance_banner: Custom banner for the magazine. It is - displayed above all threads and should be in a wide aspect ratio (5:1, or +magazine_theme_appearance_banner: Custom banner for the magazine. It is + displayed above all threads and should be in a wide aspect ratio (5:1, or 1500px * 300px). magazine_theme_appearance_background_image: Custom background image that will be applied when viewing content within your magazine. @@ -743,28 +745,28 @@ moderation.report.approve_report_title: Approve Report moderation.report.reject_report_title: Reject Report moderation.report.ban_user_description: Do you want to ban the user (%username%) who created this content from this magazine? -moderation.report.approve_report_confirmation: Are you sure that you want to +moderation.report.approve_report_confirmation: Are you sure that you want to approve this report? subject_reported_exists: This content has already been reported. moderation.report.ban_user_title: Ban User -moderation.report.reject_report_confirmation: Are you sure that you want to +moderation.report.reject_report_confirmation: Are you sure that you want to reject this report? -oauth2.grant.moderate.post.pin: Pin posts to the top of your moderated +oauth2.grant.moderate.post.pin: Pin posts to the top of your moderated magazines. delete_content: Delete content purge_content: Purge content -delete_content_desc: Delete the user's content while leaving the responses of +delete_content_desc: Delete the user's content while leaving the responses of other users in the created threads, posts and comments. -purge_content_desc: Completely purge the user's content, including deleting the +purge_content_desc: Completely purge the user's content, including deleting the responses of other users in created threads, posts and comments. -delete_account_desc: Delete the account, including the responses of other users +delete_account_desc: Delete the account, including the responses of other users in created threads, posts and comments. schedule_delete_account: Schedule Deletion -schedule_delete_account_desc: Schedule the deletion of this account in 30 days. - This will hide the user and their content as well as prevent the user from +schedule_delete_account_desc: Schedule the deletion of this account in 30 days. + This will hide the user and their content as well as prevent the user from logging in. remove_schedule_delete_account: Remove Scheduled Deletion -remove_schedule_delete_account_desc: Remove the scheduled deletion. All the +remove_schedule_delete_account_desc: Remove the scheduled deletion. All the content will be available again and the user will be able to login. two_factor_authentication: Two-factor authentication two_factor_backup: Two-factor authentication backup codes @@ -781,24 +783,24 @@ two_factor_backup: Two-factor authentication backup codes 2fa.remove: Remove 2FA 2fa.add: Add to my account 2fa.verify_authentication_code.label: Enter a two-factor code to verify setup -2fa.qr_code_img.alt: A QR code that allows the setup of two-factor +2fa.qr_code_img.alt: A QR code that allows the setup of two-factor authentication for your account -2fa.qr_code_link.title: Visiting this link may allow your platform to register +2fa.qr_code_link.title: Visiting this link may allow your platform to register this two-factor authentication 2fa.user_active_tfa.title: User has active 2FA -2fa.available_apps: Use a two-factor authentication app such as - %google_authenticator%, %aegis% (Android) or %raivo% (iOS) to scan the +2fa.available_apps: Use a two-factor authentication app such as + %google_authenticator%, %aegis% (Android) or %raivo% (iOS) to scan the QR-code. -2fa.backup_codes.help: You can use these codes when you don't have your - two-factor authentication device or app. You will not be shown them - again and will be able to use each of them only +2fa.backup_codes.help: You can use these codes when you don't have your + two-factor authentication device or app. You will not be shown them + again and will be able to use each of them only once. -2fa.backup_codes.recommendation: It is recommended that you keep a copy of them +2fa.backup_codes.recommendation: It is recommended that you keep a copy of them in a safe place. 2fa.manual_code_hint: If you cannot scan the QR code, enter the secret manually cancel: Cancel password_and_2fa: Password & 2FA -flash_account_settings_changed: Your account settings have been successfully +flash_account_settings_changed: Your account settings have been successfully changed. You will need to login again. show_subscriptions: Show subscriptions subscription_sort: Sort @@ -815,17 +817,17 @@ position_bottom: Bottom position_top: Top pending: Pending flash_thread_new_error: Thread could not be created. Something went wrong. -flash_thread_tag_banned_error: Thread could not be created. The content is not +flash_thread_tag_banned_error: Thread could not be created. The content is not allowed. -flash_thread_ref_image_not_found: The image referenced by 'imageHash' could not +flash_thread_ref_image_not_found: The image referenced by 'imageHash' could not be found. -flash_image_download_too_large_error: Image could not be created, it is too big +flash_image_download_too_large_error: Image could not be created, it is too big (max size %bytes%) flash_email_was_sent: Email has been successfully sent. flash_email_failed_to_sent: Email could not be sent. flash_post_new_success: Post has been successfully created. flash_post_new_error: Post could not be created. Something went wrong. -flash_magazine_theme_changed_success: Successfully updated the magazine +flash_magazine_theme_changed_success: Successfully updated the magazine appearance. flash_magazine_theme_changed_error: Failed to update the magazine appearance. flash_comment_new_success: Comment has been successfully created. @@ -851,20 +853,20 @@ open_url_to_fediverse: Open original URL change_my_avatar: Change my avatar change_my_cover: Change my cover edit_my_profile: Edit my profile -account_settings_changed: Your account settings have been successfully changed. +account_settings_changed: Your account settings have been successfully changed. You will need to login again. magazine_deletion: Magazine deletion delete_magazine: Delete magazine restore_magazine: Restore magazine purge_magazine: Purge magazine -magazine_is_deleted: Magazine is deleted. You can restore it within 30 days. suspend_account: Suspend account unsuspend_account: Unsuspend account account_suspended: The account has been suspended. account_unsuspended: The account has been unsuspended. deletion: Deletion -user_suspend_desc: Suspending your account hides your content on the instance, +user_suspend_desc: Suspending your account hides your content on the instance, but doesn't permanently remove it, and you can restore it at any time. account_banned: The account has been banned. account_unbanned: The account has been unbanned. @@ -899,11 +901,11 @@ show: Show hide: Hide edited: edited sso_registrations_enabled: SSO registrations enabled -sso_registrations_enabled.error: New account registrations with third-party +sso_registrations_enabled.error: New account registrations with third-party identity managers are currently disabled. sso_only_mode: Restrict login and registration to SSO methods only related_entry: Related -restrict_magazine_creation: Restrict local magazine creation to admins and +restrict_magazine_creation: Restrict local magazine creation to admins and global mods sso_show_first: Show SSO first on login and registration pages continue_with: Continue with @@ -946,16 +948,16 @@ notification_title_removed_post: A post was removed notification_title_edited_post: A post was edited notification_title_new_signup: A new user registered notification_body_new_signup: The user %u% registered. -notification_body2_new_signup_approval: You need to approve the request before +notification_body2_new_signup_approval: You need to approve the request before they can log in show_related_magazines: Show random magazines show_related_entries: Show random threads show_related_posts: Show random posts show_active_users: Show active users notification_title_new_report: A new report was created -magazine_posting_restricted_to_mods_warning: Only mods can create threads in +magazine_posting_restricted_to_mods_warning: Only mods can create threads in this magazine -flash_posting_restricted_error: Creating threads is restricted to mods in this +flash_posting_restricted_error: Creating threads is restricted to mods in this magazine and you are not one server_software: Server software version: Version @@ -964,7 +966,7 @@ last_successful_receive: Last successful receive last_failed_contact: Last failed contact magazine_posting_restricted_to_mods: Restrict thread creation to moderators new_user_description: This user is new (active for less than %days% days) -new_magazine_description: This magazine is new (active for less than %days% +new_magazine_description: This magazine is new (active for less than %days% days) admin_users_active: Active admin_users_inactive: Inactive @@ -999,22 +1001,22 @@ search_type_user: Users search_type_actors: Magazines + Users search_type_content: Threads + Microblogs select_user: Choose a user -new_users_need_approval: New users have to be approved by an admin before they +new_users_need_approval: New users have to be approved by an admin before they can log in. signup_requests: Signup requests application_text: Explain why you want to join signup_requests_header: Signup Requests -signup_requests_paragraph: These users would like to join your server. They +signup_requests_paragraph: These users would like to join your server. They cannot log in until you've approved their signup request. -flash_application_info: An admin needs to approve your account before you can +flash_application_info: An admin needs to approve your account before you can log in. You will receive an email once your signup request has been processed. email_application_approved_title: Your signup request has been approved -email_application_approved_body: Your signup request was approved by the server +email_application_approved_body: Your signup request was approved by the server admin. You can now log into the server at %siteName%. email_application_rejected_title: Your signup request has been rejected -email_application_rejected_body: Thank you for your interest, but we regret to +email_application_rejected_body: Thank you for your interest, but we regret to inform you that your signup request has been declined. -email_application_pending: Your account requires admin approval before you can +email_application_pending: Your account requires admin approval before you can log in. email_verification_pending: You have to verify your email address before you can log in. @@ -1031,22 +1033,22 @@ compact_view_help: A compact view with less margins, where the media is moved to show_users_avatars_help: Display the user avatar image. show_magazines_icons_help: Display the magazine icon. show_thumbnails_help: Show the thumbnail images. -image_lightbox_in_list_help: When checked, clicking the thumbnail shows a modal +image_lightbox_in_list_help: When checked, clicking the thumbnail shows a modal image box window. When unchecked, clicking the thumbnail will open the thread. show_new_icons: Show new icons show_new_icons_help: Show icon for new magazine/user (30 days old or newer) -magazine_instance_defederated_info: The instance of this magazine is +magazine_instance_defederated_info: The instance of this magazine is defederated. The magazine will therefore not receive updates. user_instance_defederated_info: The instance of this user is defederated. flash_thread_instance_banned: The instance of this magazine is banned. show_rich_mention: Rich mentions -show_rich_mention_help: Render a user component when a user is mentioned. This +show_rich_mention_help: Render a user component when a user is mentioned. This will include their display name and profile picture. show_rich_mention_magazine: Rich magazine mentions -show_rich_mention_magazine_help: Render a magazine component when a magazine is +show_rich_mention_magazine_help: Render a magazine component when a magazine is mentioned. This will include their display name and icon. show_rich_ap_link: Rich AP links -show_rich_ap_link_help: Render an inline component when other ActivityPub +show_rich_ap_link_help: Render an inline component when other ActivityPub content is linked to. attitude: Attitude type_search_magazine: Limit search to magazine... @@ -1071,17 +1073,17 @@ direct_message_setting_label: Who can send you a direct message delete_magazine_icon: Delete magazine icon flash_magazine_theme_icon_detached_success: Magazine icon deleted successfully delete_magazine_banner: Delete magazine banner -flash_magazine_theme_banner_detached_success: Magazine banner deleted +flash_magazine_theme_banner_detached_success: Magazine banner deleted successfully federation_uses_allowlist: Use allowlist for federation defederating_instance: Defederating instance %i -their_user_follows: Amount of users from their instance following users on our +their_user_follows: Amount of users from their instance following users on our instance -our_user_follows: Amount of users from our instance following users on their +our_user_follows: Amount of users from our instance following users on their instance -their_magazine_subscriptions: Amount of users from their instance subscribed to +their_magazine_subscriptions: Amount of users from their instance subscribed to magazines on our instance -our_magazine_subscriptions: Amount of users on our instance subscribed to +our_magazine_subscriptions: Amount of users on our instance subscribed to magazines from their instance confirm_defederation: Confirm defederation flash_error_defederation_must_confirm: You have to confirm the defederation @@ -1091,7 +1093,7 @@ btn_allow: Allow ban_instance: Ban instance allow_instance: Allow instance federation_page_use_allowlist_help: If an allow list is used, this instance will - only federate with the explicitly allowed instances. Otherwise this instance + only federate with the explicitly allowed instances. Otherwise this instance will federate with every instance, except those that are banned. you_have_been_banned_from_magazine: You have been banned from magazine %m. you_have_been_banned_from_magazine_permanently: You have been permanently banned from magazine %m.