From 5fe28984dde3a30b0ba328ecc7caab3726c80f82 Mon Sep 17 00:00:00 2001 From: asonix Date: Wed, 8 Apr 2020 19:44:03 -0500 Subject: [PATCH] Update translations --- app/javascript/mastodon/locales/dog.json | 2 + app/javascript/mastodon/locales/lion.json | 1 + app/javascript/mastodon/locales/squeak.json | 1 + config/locales/dog.yml | 50 ++++++++++++++++++- config/locales/lion.yml | 53 +++++++++++++++++++-- config/locales/simple_form.dog.yml | 8 ++++ config/locales/simple_form.lion.yml | 8 ++++ config/locales/simple_form.squeak.yml | 7 +++ config/locales/squeak.yml | 51 +++++++++++++++++++- 9 files changed, 174 insertions(+), 7 deletions(-) diff --git a/app/javascript/mastodon/locales/dog.json b/app/javascript/mastodon/locales/dog.json index 19120d1a9..ef9fed94d 100644 --- a/app/javascript/mastodon/locales/dog.json +++ b/app/javascript/mastodon/locales/dog.json @@ -1,6 +1,7 @@ { "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", @@ -163,6 +164,7 @@ "errors.unexpected_crash.report_issue": "Report issue", "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.", "getting_started.developers": "Developers", "getting_started.directory": "Profile directory", "getting_started.documentation": "Documentation", diff --git a/app/javascript/mastodon/locales/lion.json b/app/javascript/mastodon/locales/lion.json index 9ac559185..0abae066a 100644 --- a/app/javascript/mastodon/locales/lion.json +++ b/app/javascript/mastodon/locales/lion.json @@ -164,6 +164,7 @@ "errors.unexpected_crash.report_issue": "Report issue", "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.", "getting_started.developers": "Developers", "getting_started.directory": "Profile directory", "getting_started.documentation": "Documentation", diff --git a/app/javascript/mastodon/locales/squeak.json b/app/javascript/mastodon/locales/squeak.json index f9e3a0a86..9f0047c94 100644 --- a/app/javascript/mastodon/locales/squeak.json +++ b/app/javascript/mastodon/locales/squeak.json @@ -164,6 +164,7 @@ "errors.unexpected_crash.report_issue": "Report issue", "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.", "getting_started.developers": "Developers", "getting_started.directory": "Profile directory", "getting_started.documentation": "Documentation", diff --git a/config/locales/dog.yml b/config/locales/dog.yml index 4e883ee99..f384e6e06 100644 --- a/config/locales/dog.yml +++ b/config/locales/dog.yml @@ -92,6 +92,7 @@ dog: delete: Delete destroyed_msg: Moderation note successfully destroyed! accounts: + add_email_domain_block: Blacklist e-mail domain approve: Approve approve_all: Approve all are_you_sure: Are you sure? @@ -172,6 +173,7 @@ dog: staff: Staff user: Dog search: Search + search_same_email_domain: Other dogs with the same e-mail domain search_same_ip: Other dogs with the same IP shared_inbox_url: Shared inbox URL show: @@ -193,6 +195,42 @@ dog: web: Web whitelisted: Whitelisted action_logs: + action_types: + assigned_to_self_report: Assign Report + change_email_user: Change E-mail for User + confirm_user: Confirm User + create_account_warning: Create Warning + create_announcement: Create Announcement + create_custom_emoji: Create Custom Emoji + create_domain_allow: Create Domain Allow + create_domain_block: Create Domain Block + create_email_domain_block: Create E-mail Domain Block + demote_user: Demote User + destroy_announcement: Delete Announcement + destroy_custom_emoji: Delete Custom Emoji + destroy_domain_allow: Delete Domain Allow + destroy_domain_block: Delete Domain Block + destroy_email_domain_block: Delete e-mail domain block + destroy_status: Delete Status + disable_2fa_user: Disable 2FA + disable_custom_emoji: Disable Custom Emoji + disable_user: Disable User + enable_custom_emoji: Enable Custom Emoji + enable_user: Enable User + memorialize_account: Memorialize Account + promote_user: Promote User + remove_avatar_user: Remove Avatar + reopen_report: Reopen Report + reset_password_user: Reset Password + resolve_report: Resolve Report + silence_account: Silence Account + suspend_account: Suspend Account + unassigned_report: Unassign Report + unsilence_account: Unsilence Account + unsuspend_account: Unsuspend Account + update_announcement: Update Announcement + update_custom_emoji: Update Custom Emoji + update_status: Update Status actions: assigned_to_self_report: "%{name} assigned report %{target} to themselves" change_email_user: "%{name} changed the e-mail address of dog %{target}" @@ -230,6 +268,9 @@ dog: update_custom_emoji: "%{name} updated emoji %{target}" update_status: "%{name} updated toot by %{target}" deleted_status: "(deleted toot)" + empty: No logs found. + filter_by_action: Filter by action + filter_by_user: Filter by dog title: Audit log announcements: destroyed_msg: Announcement successfully deleted! @@ -358,6 +399,7 @@ dog: destroyed_msg: Successfully deleted e-mail domain from blacklist domain: Domain empty: No e-mail domains currently blacklisted. + from_html: from %{domain} new: create: Add domain title: New e-mail blacklist entry @@ -537,6 +579,9 @@ dog: trends: desc_html: Publicly display previously reviewed hashtags that are currently trending title: Trending hashtags + site_uploads: + delete: Delete uploaded file + destroyed_msg: Site upload successfully deleted! statuses: back_to_account: Back to account page batch: @@ -573,7 +618,6 @@ dog: warning_presets: add_new: Add new delete: Delete - edit: Edit edit_preset: Edit warning preset title: Manage warning presets admin_mailer: @@ -745,7 +789,6 @@ dog: blocks: You block csv: CSV domain_blocks: Domain blocks - follows: You have joined lists: Lists mutes: You mute storage: Media storage @@ -851,6 +894,7 @@ dog: media_attachments: validations: images_and_video: Cannot attach a video to a toot that already contains images + not_ready: Cannot attach files that have not finished processing. Try again in a moment! too_many: Cannot attach more than 4 files migrations: acct: Moved to @@ -1073,6 +1117,8 @@ dog: disallowed_hashtags: one: 'contained a disallowed hashtag: %{tags}' other: 'contained the disallowed hashtags: %{tags}' + errors: + in_reply_not_found: The toot you are trying to reply to does not appear to exist. language_detection: Automatically detect language open_in_web: Open in web over_character_limit: character limit of %{max} exceeded diff --git a/config/locales/lion.yml b/config/locales/lion.yml index c7a4100e8..ac8e17fe4 100644 --- a/config/locales/lion.yml +++ b/config/locales/lion.yml @@ -11,8 +11,8 @@ lion: apps: Mobile apps apps_platforms: Use Mastodon from iOS, Android and other platforms browse_directory: Browse a profile directory and filter by interests + browse_local_posts: Browse a live stream of public posts from this server browse_public_posts: Browse a live stream of public posts on Mastodon - browse_public_posts: Browse a live stream of public toots on Mastodon contact: Contact contact_missing: Not set contact_unavailable: N/A @@ -92,6 +92,7 @@ lion: delete: Delete destroyed_msg: Moderation note successfully destroyed! accounts: + add_email_domain_block: Blacklist e-mail domain approve: Approve approve_all: Approve all are_you_sure: Are you sure? @@ -172,6 +173,7 @@ lion: staff: Staff user: Lion search: Search + search_same_email_domain: Other lions with the same e-mail domain search_same_ip: Other lions with the same IP shared_inbox_url: Shared inbox URL show: @@ -193,6 +195,42 @@ lion: web: Web whitelisted: Whitelisted action_logs: + action_types: + assigned_to_self_report: Assign Report + change_email_user: Change E-mail for User + confirm_user: Confirm User + create_account_warning: Create Warning + create_announcement: Create Announcement + create_custom_emoji: Create Custom Emoji + create_domain_allow: Create Domain Allow + create_domain_block: Create Domain Block + create_email_domain_block: Create E-mail Domain Block + demote_user: Demote User + destroy_announcement: Delete Announcement + destroy_custom_emoji: Delete Custom Emoji + destroy_domain_allow: Delete Domain Allow + destroy_domain_block: Delete Domain Block + destroy_email_domain_block: Delete e-mail domain block + destroy_status: Delete Status + disable_2fa_user: Disable 2FA + disable_custom_emoji: Disable Custom Emoji + disable_user: Disable User + enable_custom_emoji: Enable Custom Emoji + enable_user: Enable User + memorialize_account: Memorialize Account + promote_user: Promote User + remove_avatar_user: Remove Avatar + reopen_report: Reopen Report + reset_password_user: Reset Password + resolve_report: Resolve Report + silence_account: Silence Account + suspend_account: Suspend Account + unassigned_report: Unassign Report + unsilence_account: Unsilence Account + unsuspend_account: Unsuspend Account + update_announcement: Update Announcement + update_custom_emoji: Update Custom Emoji + update_status: Update Status actions: assigned_to_self_report: "%{name} assigned report %{target} to themselves" change_email_user: "%{name} changed the e-mail address of lion %{target}" @@ -230,6 +268,9 @@ lion: update_custom_emoji: "%{name} updated emoji %{target}" update_status: "%{name} updated toot by %{target}" deleted_status: "(deleted toot)" + empty: No logs found. + filter_by_action: Filter by action + filter_by_user: Filter by lion title: Audit log announcements: destroyed_msg: Announcement successfully deleted! @@ -358,6 +399,7 @@ lion: destroyed_msg: Successfully deleted e-mail domain from blacklist domain: Domain empty: No e-mail domains currently blacklisted. + from_html: from %{domain} new: create: Add domain title: New e-mail blacklist entry @@ -537,6 +579,9 @@ lion: trends: desc_html: Publicly display previously reviewed hashtags that are currently trending title: Trending hashtags + site_uploads: + delete: Delete uploaded file + destroyed_msg: Site upload successfully deleted! statuses: back_to_account: Back to account page batch: @@ -573,7 +618,6 @@ lion: warning_presets: add_new: Add new delete: Delete - edit: Edit edit_preset: Edit warning preset title: Manage warning presets admin_mailer: @@ -745,7 +789,6 @@ lion: blocks: You block csv: CSV domain_blocks: Domain blocks - follows: You have joined lists: Lists mutes: You mute storage: Media storage @@ -851,6 +894,7 @@ lion: media_attachments: validations: images_and_video: Cannot attach a video to a toot that already contains images + not_ready: Cannot attach files that have not finished processing. Try again in a moment! too_many: Cannot attach more than 4 files migrations: acct: Moved to @@ -946,6 +990,7 @@ lion: duration_too_long: is too far into the future duration_too_short: is too soon expired: The poll has already ended + invalid_choice: The chosen vote option does not exist over_character_limit: cannot be longer than %{max} characters each too_few_options: must have more than one item too_many_options: can't contain more than %{max} items @@ -1072,6 +1117,8 @@ lion: disallowed_hashtags: one: 'contained a disallowed hashtag: %{tags}' other: 'contained the disallowed hashtags: %{tags}' + errors: + in_reply_not_found: The toot you are trying to reply to does not appear to exist. language_detection: Automatically detect language open_in_web: Open in web over_character_limit: character limit of %{max} exceeded diff --git a/config/locales/simple_form.dog.yml b/config/locales/simple_form.dog.yml index 6d43dd033..ab9adc78f 100644 --- a/config/locales/simple_form.dog.yml +++ b/config/locales/simple_form.dog.yml @@ -8,6 +8,7 @@ dog: acct: Specify the username@domain of the account you want to move to account_warning_preset: text: You can use toot syntax, such as URLs, hashtags and mentions + title: Optional. Not visible to the recipient admin_account_action: include_statuses: The dog will see which toots have caused the moderation action or warning send_email_notification: The user will receive an explanation of what happened with their account @@ -53,6 +54,9 @@ dog: whole_word: When the keyword or phrase is alphanumeric only, it will only be applied if it matches the whole word domain_allow: domain: This domain will be able to fetch data from this server and incoming data from it will be processed and stored + email_domain_block: + domain: This can be the domain name that shows up in the e-mail address, the MX record that domain resolves to, or IP of the server that MX record resolves to. Those will be checked upon user sign-up and the sign-up will be rejected. + with_dns_records: An attempt to resolve the given domain's DNS records will be made and the results will also be blacklisted featured_tag: name: 'You might want to use one of these:' form_challenge: @@ -78,6 +82,7 @@ dog: acct: Handle of the new account account_warning_preset: text: Preset text + title: Title admin_account_action: include_statuses: Include reported toots in the e-mail send_email_notification: Notify the user per e-mail @@ -125,6 +130,7 @@ dog: setting_aggregate_reblogs: Group awoos in timelines setting_auto_play_gif: Auto-play animated GIFs setting_boost_modal: Show confirmation dialog before awooing + setting_crop_images: Crop images in non-expanded toots to 16x9 setting_default_language: Posting language setting_default_privacy: Posting privacy setting_default_sensitive: Always mark media as sensitive @@ -150,6 +156,8 @@ dog: username: Username username_or_email: Username or Email whole_word: Whole word + email_domain_block: + with_dns_records: Include MX records and IPs of the domain featured_tag: name: Hashtag interactions: diff --git a/config/locales/simple_form.lion.yml b/config/locales/simple_form.lion.yml index e33b0e120..2a4e8b6c7 100644 --- a/config/locales/simple_form.lion.yml +++ b/config/locales/simple_form.lion.yml @@ -8,6 +8,7 @@ lion: acct: Specify the username@domain of the account you want to move to account_warning_preset: text: You can use toot syntax, such as URLs, hashtags and mentions + title: Optional. Not visible to the recipient admin_account_action: include_statuses: The lion will see which toots have caused the moderation action or warning send_email_notification: The user will receive an explanation of what happened with their account @@ -53,6 +54,9 @@ lion: whole_word: When the keyword or phrase is alphanumeric only, it will only be applied if it matches the whole word domain_allow: domain: This domain will be able to fetch data from this server and incoming data from it will be processed and stored + email_domain_block: + domain: This can be the domain name that shows up in the e-mail address, the MX record that domain resolves to, or IP of the server that MX record resolves to. Those will be checked upon user sign-up and the sign-up will be rejected. + with_dns_records: An attempt to resolve the given domain's DNS records will be made and the results will also be blacklisted featured_tag: name: 'You might want to use one of these:' form_challenge: @@ -78,6 +82,7 @@ lion: acct: Handle of the new account account_warning_preset: text: Preset text + title: Title admin_account_action: include_statuses: Include reported toots in the e-mail send_email_notification: Notify the user per e-mail @@ -125,6 +130,7 @@ lion: setting_aggregate_reblogs: Group roars in timelines setting_auto_play_gif: Auto-play animated GIFs setting_boost_modal: Show confirmation dialog before roaring + setting_crop_images: Crop images in non-expanded toots to 16x9 setting_default_language: Posting language setting_default_privacy: Posting privacy setting_default_sensitive: Always mark media as sensitive @@ -150,6 +156,8 @@ lion: username: Username username_or_email: Username or Email whole_word: Whole word + email_domain_block: + with_dns_records: Include MX records and IPs of the domain featured_tag: name: Hashtag interactions: diff --git a/config/locales/simple_form.squeak.yml b/config/locales/simple_form.squeak.yml index 5117839a7..47e8b3a51 100644 --- a/config/locales/simple_form.squeak.yml +++ b/config/locales/simple_form.squeak.yml @@ -8,6 +8,7 @@ squeak: acct: Specify the username@domain of the account you want to move to account_warning_preset: text: You can use toot syntax, such as URLs, hashtags and mentions + title: Optional. Not visible to the recipient admin_account_action: include_statuses: The user will see which toots have caused the moderation action or warning send_email_notification: The user will receive an explanation of what happened with their account @@ -53,6 +54,9 @@ squeak: whole_word: When the keyword or phrase is alphanumeric only, it will only be applied if it matches the whole word domain_allow: domain: This domain will be able to fetch data from this server and incoming data from it will be processed and stored + email_domain_block: + domain: This can be the domain name that shows up in the e-mail address, the MX record that domain resolves to, or IP of the server that MX record resolves to. Those will be checked upon user sign-up and the sign-up will be rejected. + with_dns_records: An attempt to resolve the given domain's DNS records will be made and the results will also be blacklisted featured_tag: name: 'You might want to use one of these:' form_challenge: @@ -78,6 +82,7 @@ squeak: acct: Handle of the new account account_warning_preset: text: Preset text + title: Title admin_account_action: include_statuses: Include reported toots in the e-mail send_email_notification: Notify the user per e-mail @@ -151,6 +156,8 @@ squeak: username: Username username_or_email: Username or Email whole_word: Whole word + email_domain_block: + with_dns_records: Include MX records and IPs of the domain featured_tag: name: Hashtag interactions: diff --git a/config/locales/squeak.yml b/config/locales/squeak.yml index fe54ee8b2..765d32cf8 100644 --- a/config/locales/squeak.yml +++ b/config/locales/squeak.yml @@ -92,6 +92,7 @@ squeak: delete: Delete destroyed_msg: Moderation note successfully destroyed! accounts: + add_email_domain_block: Blacklist e-mail domain approve: Approve approve_all: Approve all are_you_sure: Are you sure? @@ -172,6 +173,7 @@ squeak: staff: Staff user: User search: Search + search_same_email_domain: Other users with the same e-mail domain search_same_ip: Other users with the same IP shared_inbox_url: Shared inbox URL show: @@ -193,6 +195,42 @@ squeak: web: Web whitelisted: Whitelisted action_logs: + action_types: + assigned_to_self_report: Assign Report + change_email_user: Change E-mail for User + confirm_user: Confirm User + create_account_warning: Create Warning + create_announcement: Create Announcement + create_custom_emoji: Create Custom Emoji + create_domain_allow: Create Domain Allow + create_domain_block: Create Domain Block + create_email_domain_block: Create E-mail Domain Block + demote_user: Demote User + destroy_announcement: Delete Announcement + destroy_custom_emoji: Delete Custom Emoji + destroy_domain_allow: Delete Domain Allow + destroy_domain_block: Delete Domain Block + destroy_email_domain_block: Delete e-mail domain block + destroy_status: Delete Status + disable_2fa_user: Disable 2FA + disable_custom_emoji: Disable Custom Emoji + disable_user: Disable User + enable_custom_emoji: Enable Custom Emoji + enable_user: Enable User + memorialize_account: Memorialize Account + promote_user: Promote User + remove_avatar_user: Remove Avatar + reopen_report: Reopen Report + reset_password_user: Reset Password + resolve_report: Resolve Report + silence_account: Silence Account + suspend_account: Suspend Account + unassigned_report: Unassign Report + unsilence_account: Unsilence Account + unsuspend_account: Unsuspend Account + update_announcement: Update Announcement + update_custom_emoji: Update Custom Emoji + update_status: Update Status actions: assigned_to_self_report: "%{name} assigned report %{target} to themselves" change_email_user: "%{name} changed the e-mail address of user %{target}" @@ -230,6 +268,9 @@ squeak: update_custom_emoji: "%{name} updated emoji %{target}" update_status: "%{name} updated status by %{target}" deleted_status: "(deleted status)" + empty: No logs found. + filter_by_action: Filter by action + filter_by_user: Filter by user title: Audit log announcements: destroyed_msg: Announcement successfully deleted! @@ -358,6 +399,7 @@ squeak: destroyed_msg: Successfully deleted e-mail domain from blacklist domain: Domain empty: No e-mail domains currently blacklisted. + from_html: from %{domain} new: create: Add domain title: New e-mail blacklist entry @@ -537,6 +579,9 @@ squeak: trends: desc_html: Publicly display previously reviewed hashtags that are currently trending title: Trending hashtags + site_uploads: + delete: Delete uploaded file + destroyed_msg: Site upload successfully deleted! statuses: back_to_account: Back to account page batch: @@ -573,7 +618,6 @@ squeak: warning_presets: add_new: Add new delete: Delete - edit: Edit edit_preset: Edit warning preset title: Manage warning presets admin_mailer: @@ -725,7 +769,7 @@ squeak: '422': content: Security verification failed. Are you blocking cookies? title: Security verification failed - '429': Throttled + '429': Too many requests '500': content: We're sorry, but something went wrong on our end. title: This page is not correct @@ -850,6 +894,7 @@ squeak: media_attachments: validations: images_and_video: Cannot attach a video to a status that already contains images + not_ready: Cannot attach files that have not finished processing. Try again in a moment! too_many: Cannot attach more than 4 files migrations: acct: Moved to @@ -1072,6 +1117,8 @@ squeak: disallowed_hashtags: one: 'contained a disallowed hashtag: %{tags}' other: 'contained the disallowed hashtags: %{tags}' + errors: + in_reply_not_found: The status you are trying to reply to does not appear to exist. language_detection: Automatically detect language open_in_web: Open in web over_character_limit: character limit of %{max} exceeded