Change “e-mail” to “email” in en.yml (#31317)

config/locales/en.yml

@@ -31,7 +31,7 @@ en:
       created_msg: Moderation note successfully created!
       destroyed_msg: Moderation note successfully destroyed!
     accounts:
-      add_email_domain_block: Block e-mail domain
+      add_email_domain_block: Block email domain
       approve: Approve
       approved_msg: Successfully approved %{username}'s sign-up application
       are_you_sure: Are you sure?
@@ -58,7 +58,7 @@ en:
       demote: Demote
       destroyed_msg: "%{username}'s data is now queued to be deleted imminently"
       disable: Freeze
-      disable_sign_in_token_auth: Disable e-mail token authentication
+      disable_sign_in_token_auth: Disable email token authentication
       disable_two_factor_authentication: Disable 2FA
       disabled: Frozen
       display_name: Display name
@@ -67,7 +67,7 @@ en:
       email: Email
       email_status: Email status
       enable: Unfreeze
-      enable_sign_in_token_auth: Enable e-mail token authentication
+      enable_sign_in_token_auth: Enable email token authentication
       enabled: Enabled
       enabled_msg: Successfully unfroze %{username}'s account
       followers: Followers
@@ -132,7 +132,7 @@ en:
       resubscribe: Resubscribe
       role: Role
       search: Search
-      search_same_email_domain: Other users with the same e-mail domain
+      search_same_email_domain: Other users with the same email domain
       search_same_ip: Other users with the same IP
       security: Security
       security_measures:
@@ -173,26 +173,26 @@ en:
         approve_appeal: Approve Appeal
         approve_user: Approve User
         assigned_to_self_report: Assign Report
-        change_email_user: Change E-mail for User
+        change_email_user: Change Email for User
         change_role_user: Change Role of User
         confirm_user: Confirm User
         create_account_warning: Create Warning
         create_announcement: Create Announcement
-        create_canonical_email_block: Create E-mail Block
+        create_canonical_email_block: Create Email Block
         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
+        create_email_domain_block: Create Email Domain Block
         create_ip_block: Create IP rule
         create_unavailable_domain: Create Unavailable Domain
         create_user_role: Create Role
         demote_user: Demote User
         destroy_announcement: Delete Announcement
-        destroy_canonical_email_block: Delete E-mail Block
+        destroy_canonical_email_block: Delete Email Block
         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_email_domain_block: Delete Email Domain Block
         destroy_instance: Purge Domain
         destroy_ip_block: Delete IP rule
         destroy_status: Delete Post
@@ -200,10 +200,10 @@ en:
         destroy_user_role: Destroy Role
         disable_2fa_user: Disable 2FA
         disable_custom_emoji: Disable Custom Emoji
-        disable_sign_in_token_auth_user: Disable E-mail Token Authentication for User
+        disable_sign_in_token_auth_user: Disable Email Token Authentication for User
         disable_user: Disable User
         enable_custom_emoji: Enable Custom Emoji
-        enable_sign_in_token_auth_user: Enable E-mail Token Authentication for User
+        enable_sign_in_token_auth_user: Enable Email Token Authentication for User
         enable_user: Enable User
         memorialize_account: Memorialize Account
         promote_user: Promote User
@@ -233,26 +233,26 @@ en:
         approve_appeal_html: "%{name} approved moderation decision appeal from %{target}"
         approve_user_html: "%{name} approved sign-up from %{target}"
         assigned_to_self_report_html: "%{name} assigned report %{target} to themselves"
-        change_email_user_html: "%{name} changed the e-mail address of user %{target}"
+        change_email_user_html: "%{name} changed the email address of user %{target}"
         change_role_user_html: "%{name} changed role of %{target}"
-        confirm_user_html: "%{name} confirmed e-mail address of user %{target}"
+        confirm_user_html: "%{name} confirmed email address of user %{target}"
         create_account_warning_html: "%{name} sent a warning to %{target}"
         create_announcement_html: "%{name} created new announcement %{target}"
-        create_canonical_email_block_html: "%{name} blocked e-mail with the hash %{target}"
+        create_canonical_email_block_html: "%{name} blocked email with the hash %{target}"
         create_custom_emoji_html: "%{name} uploaded new emoji %{target}"
         create_domain_allow_html: "%{name} allowed federation with domain %{target}"
         create_domain_block_html: "%{name} blocked domain %{target}"
-        create_email_domain_block_html: "%{name} blocked e-mail domain %{target}"
+        create_email_domain_block_html: "%{name} blocked email domain %{target}"
         create_ip_block_html: "%{name} created rule for IP %{target}"
         create_unavailable_domain_html: "%{name} stopped delivery to domain %{target}"
         create_user_role_html: "%{name} created %{target} role"
         demote_user_html: "%{name} demoted user %{target}"
         destroy_announcement_html: "%{name} deleted announcement %{target}"
-        destroy_canonical_email_block_html: "%{name} unblocked e-mail with the hash %{target}"
+        destroy_canonical_email_block_html: "%{name} unblocked email with the hash %{target}"
         destroy_custom_emoji_html: "%{name} deleted emoji %{target}"
         destroy_domain_allow_html: "%{name} disallowed federation with domain %{target}"
         destroy_domain_block_html: "%{name} unblocked domain %{target}"
-        destroy_email_domain_block_html: "%{name} unblocked e-mail domain %{target}"
+        destroy_email_domain_block_html: "%{name} unblocked email domain %{target}"
         destroy_instance_html: "%{name} purged domain %{target}"
         destroy_ip_block_html: "%{name} deleted rule for IP %{target}"
         destroy_status_html: "%{name} removed post by %{target}"
@@ -260,10 +260,10 @@ en:
         destroy_user_role_html: "%{name} deleted %{target} role"
         disable_2fa_user_html: "%{name} disabled two factor requirement for user %{target}"
         disable_custom_emoji_html: "%{name} disabled emoji %{target}"
-        disable_sign_in_token_auth_user_html: "%{name} disabled e-mail token authentication for %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} disabled email token authentication for %{target}"
         disable_user_html: "%{name} disabled login for user %{target}"
         enable_custom_emoji_html: "%{name} enabled emoji %{target}"
-        enable_sign_in_token_auth_user_html: "%{name} enabled e-mail token authentication for %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} enabled email token authentication for %{target}"
         enable_user_html: "%{name} enabled login for user %{target}"
         memorialize_account_html: "%{name} turned %{target}'s account into a memoriam page"
         promote_user_html: "%{name} promoted user %{target}"
@@ -271,7 +271,7 @@ en:
         reject_user_html: "%{name} rejected sign-up from %{target}"
         remove_avatar_user_html: "%{name} removed %{target}'s avatar"
         reopen_report_html: "%{name} reopened report %{target}"
-        resend_user_html: "%{name} resent confirmation e-mail for %{target}"
+        resend_user_html: "%{name} resent confirmation email for %{target}"
         reset_password_user_html: "%{name} reset password of user %{target}"
         resolve_report_html: "%{name} resolved report %{target}"
         sensitive_account_html: "%{name} marked %{target}'s media as sensitive"
@@ -432,7 +432,7 @@ en:
       attempts_over_week:
         one: "%{count} attempt over the last week"
         other: "%{count} sign-up attempts over the last week"
-      created_msg: Successfully blocked e-mail domain
+      created_msg: Successfully blocked email domain
       delete: Delete
       dns:
         types:
@@ -441,12 +441,12 @@ en:
       new:
         create: Add domain
         resolve: Resolve domain
-        title: Block new e-mail domain
+        title: Block new email domain
-      no_email_domain_block_selected: No e-mail domain blocks were changed as none were selected
+      no_email_domain_block_selected: No email domain blocks were changed as none were selected
       not_permitted: Not permitted
-      resolved_dns_records_hint_html: The domain name resolves to the following MX domains, which are ultimately responsible for accepting e-mail. Blocking an MX domain will block sign-ups from any e-mail address which uses the same MX domain, even if the visible domain name is different. <strong>Be careful not to block major e-mail providers.</strong>
+      resolved_dns_records_hint_html: The domain name resolves to the following MX domains, which are ultimately responsible for accepting email. Blocking an MX domain will block sign-ups from any email address which uses the same MX domain, even if the visible domain name is different. <strong>Be careful not to block major email providers.</strong>
       resolved_through_html: Resolved through %{domain}
-      title: Blocked e-mail domains
+      title: Blocked email domains
     export_domain_allows:
       new:
         title: Import domain allows
@@ -600,7 +600,7 @@ en:
         resolve_description_html: No action will be taken against the reported account, no strike recorded, and the report will be closed.
         silence_description_html: The account will be visible only to those who already follow it or manually look it up, severely limiting its reach. Can always be reverted. Closes all reports against this account.
         suspend_description_html: The account and all its contents will be inaccessible and eventually deleted, and interacting with it will be impossible. Reversible within 30 days. Closes all reports against this account.
-      actions_description_html: Decide which action to take to resolve this report. If you take a punitive action against the reported account, an e-mail notification will be sent to them, except when the <strong>Spam</strong> category is selected.
+      actions_description_html: Decide which action to take to resolve this report. If you take a punitive action against the reported account, an email notification will be sent to them, except when the <strong>Spam</strong> category is selected.
       actions_description_remote_html: Decide which action to take to resolve this report. This will only affect how <strong>your</strong> server communicates with this remote account and handle its content.
       add_to_report: Add more to report
       already_suspended_badges:
@@ -665,7 +665,7 @@ en:
         delete_data_html: Delete <strong>@%{acct}</strong>'s profile and contents 30 days from now unless they get unsuspended in the meantime
         preview_preamble_html: "<strong>@%{acct}</strong> will receive a warning with the following contents:"
         record_strike_html: Record a strike against <strong>@%{acct}</strong> to help you escalate on future violations from this account
-        send_email_html: Send <strong>@%{acct}</strong> a warning e-mail
+        send_email_html: Send <strong>@%{acct}</strong> a warning email
         warning_placeholder: Optional additional reasoning for the moderation action.
       target_origin: Origin of reported account
       title: Reports
@@ -705,7 +705,7 @@ en:
         manage_appeals: Manage Appeals
         manage_appeals_description: Allows users to review appeals against moderation actions
         manage_blocks: Manage Blocks
-        manage_blocks_description: Allows users to block e-mail providers and IP addresses
+        manage_blocks_description: Allows users to block email providers and IP addresses
         manage_custom_emojis: Manage Custom Emojis
         manage_custom_emojis_description: Allows users to manage custom emojis on the server
         manage_federation: Manage Federation
@@ -723,7 +723,7 @@ en:
         manage_taxonomies: Manage Taxonomies
         manage_taxonomies_description: Allows users to review trending content and update hashtag settings
         manage_user_access: Manage User Access
-        manage_user_access_description: Allows users to disable other users' two-factor authentication, change their e-mail address, and reset their password
+        manage_user_access_description: Allows users to disable other users' two-factor authentication, change their email address, and reset their password
         manage_users: Manage Users
         manage_users_description: Allows users to view other users' details and perform moderation actions against them
         manage_webhooks: Manage Webhooks
@@ -798,7 +798,7 @@ en:
       destroyed_msg: Site upload successfully deleted!
     software_updates:
       critical_update: Critical — please update quickly
-      description: It is recommended to keep your Mastodon installation up to date to benefit from the latest fixes and features. Moreover, it is sometimes critical to update Mastodon in a timely manner to avoid security issues. For these reasons, Mastodon checks for updates every 30 minutes, and will notify you according to your e-mail notification preferences.
+      description: It is recommended to keep your Mastodon installation up to date to benefit from the latest fixes and features. Moreover, it is sometimes critical to update Mastodon in a timely manner to avoid security issues. For these reasons, Mastodon checks for updates every 30 minutes, and will notify you according to your email notification preferences.
       documentation_link: Learn more
       release_notes: Release notes
       title: Available updates
@@ -1061,9 +1061,9 @@ en:
       guide_link_text: Everyone can contribute.
     sensitive_content: Sensitive content
   application_mailer:
-    notification_preferences: Change e-mail preferences
+    notification_preferences: Change email preferences
     salutation: "%{name},"
-    settings: 'Change e-mail preferences: %{link}'
+    settings: 'Change email preferences: %{link}'
     unsubscribe: Unsubscribe
     view: 'View:'
     view_profile: View profile
@@ -1083,7 +1083,7 @@ en:
       hint_html: Just one more thing! We need to confirm you're a human (this is so we can keep the spam out!). Solve the CAPTCHA below and click "Continue".
       title: Security check
     confirmations:
-      awaiting_review: Your e-mail address is confirmed! The %{domain} staff is now reviewing your registration. You will receive an e-mail if they approve your account!
+      awaiting_review: Your email address is confirmed! The %{domain} staff is now reviewing your registration. You will receive an email if they approve your account!
       awaiting_review_title: Your registration is being reviewed
       clicking_this_link: clicking this link
       login_link: log in
@@ -1091,7 +1091,7 @@ en:
       redirect_to_app_html: You should have been redirected to the <strong>%{app_name}</strong> app. If that did not happen, try %{clicking_this_link} or manually return to the app.
       registration_complete: Your registration on %{domain} is now complete!
       welcome_title: Welcome, %{name}!
-      wrong_email_hint: If that e-mail address is not correct, you can change it in account settings.
+      wrong_email_hint: If that email address is not correct, you can change it in account settings.
     delete_account: Delete account
     delete_account_html: If you wish to delete your account, you can <a href="%{path}">proceed here</a>. You will be asked for confirmation.
     description:
@@ -1112,7 +1112,7 @@ en:
     or_log_in_with: Or log in with
     privacy_policy_agreement_html: I have read and agree to the <a href="%{privacy_policy_path}" target="_blank">privacy policy</a>
     progress:
-      confirm: Confirm e-mail
+      confirm: Confirm email
       details: Your details
       review: Our review
       rules: Accept rules
@@ -1134,10 +1134,10 @@ en:
     security: Security
     set_new_password: Set new password
     setup:
-      email_below_hint_html: Check your spam folder, or request another one. You can correct your e-mail address if it's wrong.
+      email_below_hint_html: Check your spam folder, or request another one. You can correct your email address if it's wrong.
       email_settings_hint_html: Click the link we sent you to verify %{email}. We'll wait right here.
       link_not_received: Didn't get a link?
-      new_confirmation_instructions_sent: You will receive a new e-mail with the confirmation link in a few minutes!
+      new_confirmation_instructions_sent: You will receive a new email with the confirmation link in a few minutes!
       title: Check your inbox
     sign_in:
       preamble_html: Login with your <strong>%{domain}</strong> credentials. If your account is hosted on a different server, you will not be able to log in here.
@@ -1148,9 +1148,9 @@ en:
       title: Let's get you set up on %{domain}.
     status:
       account_status: Account status
-      confirming: Waiting for e-mail confirmation to be completed.
+      confirming: Waiting for email confirmation to be completed.
       functional: Your account is fully operational.
-      pending: Your application is pending review by our staff. This may take some time. You will receive an e-mail if your application is approved.
+      pending: Your application is pending review by our staff. This may take some time. You will receive an email if your application is approved.
       redirecting_to: Your account is inactive because it is currently redirecting to %{acct}.
       self_destruct: As %{domain} is closing down, you will only get limited access to your account.
       view_strikes: View past strikes against your account
@@ -1193,9 +1193,9 @@ en:
       before: 'Before proceeding, please read these notes carefully:'
       caches: Content that has been cached by other servers may persist
       data_removal: Your posts and other data will be permanently removed
-      email_change_html: You can <a href="%{path}">change your e-mail address</a> without deleting your account
+      email_change_html: You can <a href="%{path}">change your email address</a> without deleting your account
-      email_contact_html: If it still doesn't arrive, you can e-mail <a href="mailto:%{email}">%{email}</a> for help
+      email_contact_html: If it still doesn't arrive, you can email <a href="mailto:%{email}">%{email}</a> for help
-      email_reconfirmation_html: If you are not receiving the confirmation e-mail, you can <a href="%{path}">request it again</a>
+      email_reconfirmation_html: If you are not receiving the confirmation email, you can <a href="%{path}">request it again</a>
       irreversible: You will not be able to restore or reactivate your account
       more_details_html: For more details, see the <a href="%{terms_path}">privacy policy</a>.
       username_available: Your username will become available again
@@ -1428,7 +1428,7 @@ en:
     authentication_methods:
       otp: two-factor authentication app
       password: password
-      sign_in_token: e-mail security code
+      sign_in_token: email security code
       webauthn: security keys
     description_html: If you see activity that you don't recognize, consider changing your password and enabling two-factor authentication.
     empty: No authentication history available
@@ -1439,16 +1439,16 @@ en:
     unsubscribe:
       action: Yes, unsubscribe
       complete: Unsubscribed
-      confirmation_html: Are you sure you want to unsubscribe from receiving %{type} for Mastodon on %{domain} to your e-mail at %{email}? You can always re-subscribe from your <a href="%{settings_path}">e-mail notification settings</a>.
+      confirmation_html: Are you sure you want to unsubscribe from receiving %{type} for Mastodon on %{domain} to your email at %{email}? You can always re-subscribe from your <a href="%{settings_path}">email notification settings</a>.
       emails:
         notification_emails:
-          favourite: favorite notification e-mails
+          favourite: favorite notification emails
-          follow: follow notification e-mails
+          follow: follow notification emails
-          follow_request: follow request e-mails
+          follow_request: follow request emails
-          mention: mention notification e-mails
+          mention: mention notification emails
-          reblog: boost notification e-mails
+          reblog: boost notification emails
-      resubscribe_html: If you've unsubscribed by mistake, you can re-subscribe from your <a href="%{settings_path}">e-mail notification settings</a>.
+      resubscribe_html: If you've unsubscribed by mistake, you can re-subscribe from your <a href="%{settings_path}">email notification settings</a>.
-      success_html: You'll no longer receive %{type} for Mastodon on %{domain} to your e-mail at %{email}.
+      success_html: You'll no longer receive %{type} for Mastodon on %{domain} to your email at %{email}.
       title: Unsubscribe
   media_attachments:
     validations:
@@ -1529,8 +1529,8 @@ en:
     update:
       subject: "%{name} edited a post"
   notifications:
-    administration_emails: Admin e-mail notifications
+    administration_emails: Admin email notifications
-    email_events: Events for e-mail notifications
+    email_events: Events for email notifications
     email_events_hint: 'Select events that you want to receive notifications for:'
   number:
     human:
@@ -1690,7 +1690,7 @@ en:
     import: Import
     import_and_export: Import and export
     migrate: Account migration
-    notifications: E-mail notifications
+    notifications: Email notifications
     preferences: Preferences
     profile: Public profile
     relationships: Follows and followers
@@ -1937,7 +1937,7 @@ en:
     invalid_otp_token: Invalid two-factor code
     otp_lost_help_html: If you lost access to both, you may get in touch with %{email}
     rate_limited: Too many authentication attempts, try again later.
-    seamless_external_login: You are logged in via an external service, so password and e-mail settings are not available.
+    seamless_external_login: You are logged in via an external service, so password and email settings are not available.
     signed_in_as: 'Signed in as:'
   verification:
     extra_instructions_html: <strong>Tip:</strong> The link on your website can be invisible. The important part is <code>rel="me"</code> which prevents impersonation on websites with user-generated content. You can even use a <code>link</code> tag in the header of the page instead of <code>a</code>, but the HTML must be accessible without executing JavaScript.