Improve multiple strings in en-US locale

options/locale/locale_en-US.ini

@@ -29,7 +29,7 @@ username = Username
 email = Email Address
 password = Password
 access_token = Access Token
-re_type = Re-Type Password
+re_type = Confirm Password
 captcha = CAPTCHA
 twofa = Two-Factor Authentication
 twofa_scratch = Two-Factor Scratch Code
@@ -170,7 +170,7 @@ string.desc = Z - A
 
 [error]
 occurred = An error occurred
-report_message = If you believe that this is a Gitea bug, please search for issues on <a href="%[1]s" target="_blank">GitHub</a> or open a new issue if necessary.
+report_message = If you believe that this is a Gitea bug, please search for issues on <a href="%[1]s" target="_blank">%[2]s</a> or open a new issue if necessary.
 missing_csrf = Bad Request: no CSRF token present
 invalid_csrf = Bad Request: invalid CSRF token
 not_found = The target couldn't be found.
@@ -368,7 +368,7 @@ reset_password_mail_sent_prompt = A confirmation email has been sent to <b>%s</b
 active_your_account = Activate Your Account
 account_activated = Account has been activated
 prohibit_login = Sign In Prohibited
-prohibit_login_desc = Your account is prohibited to sign in, please contact your site administrator.
+prohibit_login_desc = Your account has been banned, please contact your site administrator for more information.
 resent_limit_prompt = You have already requested an activation email recently. Please wait 3 minutes and try again.
 has_unconfirmed_mail = Hi %s, you have an unconfirmed email address (<b>%s</b>). If you haven't received a confirmation email or need to resend a new one, please click on the button below.
 resend_mail = Click here to resend your activation email
@@ -378,7 +378,7 @@ reset_password = Account Recovery
 invalid_code = Your confirmation code is invalid or has expired.
 invalid_password = Your password does not match the password that was used to create the account.
 reset_password_helper = Recover Account
-reset_password_wrong_user = You are signed in as %s, but the account recovery link is for %s
+reset_password_wrong_user = You are signed in as %s, but the account recovery link is meant for %s
 password_too_short = Password length cannot be less than %d characters.
 non_local_account = Non-local users cannot update their password through the Gitea web interface.
 verify = Verify
@@ -403,7 +403,7 @@ openid_connect_title = Connect to an existing account
 openid_connect_desc = The chosen OpenID URI is unknown. Associate it with a new account here.
 openid_register_title = Create new account
 openid_register_desc = The chosen OpenID URI is unknown. Associate it with a new account here.
-openid_signin_desc = Enter your OpenID URI. For example: https://anne.me, bob.openid.org.cn or gnusocial.net/carry.
+openid_signin_desc = Enter your OpenID URI. For example: alice.openid.example.org or https://openid.example.org/alice.
 disable_forgot_password_mail = Account recovery is disabled because no email is set up. Please contact your site administrator.
 disable_forgot_password_mail_admin = Account recovery is only available when email is set up. Please set up email to enable account recovery.
 email_domain_blacklisted = You cannot register with your email address.
@@ -413,9 +413,9 @@ authorize_application_created_by = This application was created by %s.
 authorize_application_description = If you grant the access, it will be able to access and write to all your account information, including private repos and organisations.
 authorize_title = Authorize "%s" to access your account?
 authorization_failed = Authorization failed
-authorization_failed_desc = The authorization failed because we detected an invalid request. Please contact the maintainer of the app you've tried to authorize.
+authorization_failed_desc = The authorization failed because we detected an invalid request. Please contact the maintainer of the app you have tried to authorize.
 sspi_auth_failed = SSPI authentication failed
-password_pwned = The password you chose is on a <a target="_blank" rel="noopener noreferrer" href="https://haveibeenpwned.com/Passwords">list of stolen passwords</a> previously exposed in public data breaches. Please try again with a different password.
+password_pwned = The password you chose is on a <a target="_blank" rel="noopener noreferrer" href="https://haveibeenpwned.com/Passwords">list of stolen passwords</a> previously exposed in public data breaches. Please try again with a different password and consider changing this password elsewhere too.
 password_pwned_err = Could not complete request to HaveIBeenPwned
 
 [mail]
@@ -430,7 +430,7 @@ activate_account.text_1 = Hi <b>%[1]s</b>, thanks for registering at %[2]s!
 activate_account.text_2 = Please click the following link to activate your account within <b>%s</b>:
 
 activate_email = Verify your email address
-activate_email.title = %s, please verify your e-mail address
+activate_email.title = %s, please verify your email address
 activate_email.text = Please click the following link to verify your email address within <b>%s</b>:
 
 register_notify = Welcome to Gitea
@@ -496,7 +496,7 @@ UserName = Username
 RepoName = Repository name
 Email = Email address
 Password = Password
-Retype = Re-Type Password
+Retype = Confirm Password
 SSHTitle = SSH key name
 HttpsUrl = HTTPS URL
 PayloadUrl = Payload URL
@@ -682,7 +682,7 @@ update_user_avatar_success = The user's avatar has been updated.
 change_password = Update Password
 old_password = Current Password
 new_password = New Password
-retype_new_password = Re-Type New Password
+retype_new_password = Confirm New Password
 password_incorrect = The current password is incorrect.
 change_password_success = Your password has been updated. Sign in using your new password from now on.
 password_change_disabled = Non-local users cannot update their password through the Gitea web interface.
@@ -691,7 +691,7 @@ emails = Email Addresses
 manage_emails = Manage Email Addresses
 manage_themes = Select default theme
 manage_openid = Manage OpenID Addresses
-email_desc = Your primary email address will be used for notifications and Git operations made using the web interface.
+email_desc = Your primary email address will be used for notifications, password recovery and, provided that it is not hidden, web-based Git operations.
 theme_desc = This will be your default theme across the site.
 primary = Primary
 activated = Activated
@@ -843,7 +843,7 @@ oauth2_client_id = Client ID
 oauth2_client_secret = Client Secret
 oauth2_regenerate_secret = Regenerate Secret
 oauth2_regenerate_secret_hint = Lost your secret?
-oauth2_client_secret_hint = The secret won't be visible if you revisit this page. Please save your secret.
+oauth2_client_secret_hint = The secret will disappear as soon as you leave or refresh this page. Please save your secret.
 oauth2_application_edit = Edit
 oauth2_application_create_description = OAuth2 applications gives your third-party application access to user accounts on this instance.
 oauth2_application_remove_description = Removing an OAuth2 application will prevent it to access authorized user accounts on this instance. Continue?
@@ -911,7 +911,7 @@ visibility.public_tooltip = Visible to everyone
 visibility.limited = Limited
 visibility.limited_tooltip = Visible to authenticated users only
 visibility.private = Private
-visibility.private_tooltip = Visible only to organization members
+visibility.private_tooltip = Visible only to members of organizations that you have joined
 
 [repo]
 new_repo_helper = A repository contains all project files, including revision history.  Already hosting one elsewhere? <a href="%s">Migrate repository.</a>
@@ -926,7 +926,7 @@ template_helper = Make repository a template
 template_description = Template repositories let users generate new repositories with the same directory structure, files, and optional settings.
 visibility = Visibility
 visibility_description = Only the owner or the organization members if they have rights, will be able to see it.
-visibility_helper = Make Repository Private
+visibility_helper = Make repository private
 visibility_helper_forced = Your site administrator forces new repositories to be private.
 visibility_fork_helper = (Changing this will affect all forks.)
 clone_helper = Need help cloning? Visit <a target="_blank" rel="noopener noreferrer" href="%s">Help</a>.
@@ -1540,7 +1540,7 @@ issues.tracking_already_started = `You have already started time tracking on <a
 issues.stop_tracking = Stop Timer
 issues.stop_tracking_history = `stopped working %s`
 issues.cancel_tracking = Discard
-issues.cancel_tracking_history = `cancelled time tracking %s`
+issues.cancel_tracking_history = `canceled time tracking %s`
 issues.add_time = Manually Add Time
 issues.del_time = Delete this time log
 issues.add_time_short = Add Time
@@ -1772,7 +1772,7 @@ pulls.auto_merge_has_pending_schedule = %[1]s scheduled this pull request to aut
 
 pulls.auto_merge_cancel_schedule = Cancel auto merge
 pulls.auto_merge_not_scheduled = This pull request is not scheduled to auto merge.
-pulls.auto_merge_canceled_schedule = The auto merge was cancelled for this pull request.
+pulls.auto_merge_canceled_schedule = The auto merge was canceled for this pull request.
 
 pulls.auto_merge_newly_scheduled_comment = `scheduled this pull request to auto merge when all checks succeed %[1]s`
 pulls.auto_merge_canceled_schedule_comment = `canceled auto merging this pull request when all checks succeed %[1]s`
@@ -1954,6 +1954,7 @@ settings.mirror_settings.docs.disabled_push_mirror.info = Push mirrors have been
 settings.mirror_settings.docs.no_new_mirrors = Your repository is mirroring changes to or from another repository. Please keep in mind that you can't create any new mirrors at this time.
 settings.mirror_settings.docs.can_still_use = Although you can't modify existing mirrors or create new ones, you may still use your existing mirror.
 settings.mirror_settings.docs.pull_mirror_instructions = To set up a pull mirror, please consult:
+settings.mirror_settings.docs.more_information_if_disabled = You can find out more about push and pull mirrors here:
 settings.mirror_settings.docs.doc_link_title = How do I mirror repositories?
 settings.mirror_settings.docs.pulling_remote_title = Pulling from a remote repository
 settings.mirror_settings.mirrored_repository = Mirrored repository
@@ -2032,7 +2033,7 @@ settings.transfer.rejected = Repository transfer was rejected.
 settings.transfer.success = Repository transfer was successful.
 settings.transfer_abort = Cancel transfer
 settings.transfer_abort_invalid = You cannot cancel a non existent repository transfer.
-settings.transfer_abort_success = The repository transfer to %s was successfully cancelled.
+settings.transfer_abort_success = The repository transfer to %s was successfully canceled.
 settings.transfer_desc = Transfer this repository to a user or to an organization for which you have administrator rights.
 settings.transfer_form_title = Enter the repository name as confirmation:
 settings.transfer_in_progress = There is currently an ongoing transfer. Please cancel it if you will like to transfer this repository to another user.
@@ -2463,7 +2464,7 @@ branch.already_exists = A branch named "%s" already exists.
 branch.delete_head = Delete
 branch.delete = Delete Branch "%s"
 branch.delete_html = Delete Branch
-branch.delete_desc = Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
+branch.delete_desc = Deleting a branch is permanent. Although the deleted branch may continue existing for a short time before it actually gets purged, it CANNOT be undone in most cases. Continue?
 branch.deletion_success = Branch "%s" has been deleted.
 branch.deletion_failed = Failed to delete branch "%s".
 branch.delete_branch_has_new_commits = Branch "%s" cannot be deleted because new commits have been added after merging.
@@ -2632,7 +2633,7 @@ teams.all_repositories_helper = Team has access to all repositories. Selecting t
 teams.all_repositories_read_permission_desc = This team grants <strong>Read</strong> access to <strong>all repositories</strong>: members can view and clone repositories.
 teams.all_repositories_write_permission_desc = This team grants <strong>Write</strong> access to <strong>all repositories</strong>: members can read from and push to repositories.
 teams.all_repositories_admin_permission_desc = This team grants <strong>Admin</strong> access to <strong>all repositories</strong>: members can read from, push to and add collaborators to repositories.
-teams.invite.title = You've been invited to join team <strong>%s</strong> in organization <strong>%s</strong>.
+teams.invite.title = You have been invited to join team <strong>%s</strong> in organization <strong>%s</strong>.
 teams.invite.by = Invited by %s
 teams.invite.description = Please click the button below to join the team.
 
@@ -2665,13 +2666,13 @@ dashboard.clean_unbind_oauth = Clean unbound OAuth connections
 dashboard.clean_unbind_oauth_success = All unbound OAuth connections have been deleted.
 dashboard.task.started=Started Task: %[1]s
 dashboard.task.process=Task: %[1]s
-dashboard.task.cancelled=Task: %[1]s cancelled: %[3]s
+dashboard.task.cancelled=Task: %[1]s canceled: %[3]s
 dashboard.task.error=Error in Task: %[1]s: %[3]s
 dashboard.task.finished=Task: %[1]s started by %[2]s has finished
 dashboard.task.unknown=Unknown task: %[1]s
 dashboard.cron.started=Started Cron: %[1]s
 dashboard.cron.process=Cron: %[1]s
-dashboard.cron.cancelled=Cron: %[1]s cancelled: %[3]s
+dashboard.cron.cancelled=Cron: %[1]s canceled: %[3]s
 dashboard.cron.error=Error in Cron: %s: %[3]s
 dashboard.cron.finished=Cron: %[1]s has finished
 dashboard.delete_inactive_accounts = Delete all unactivated accounts
@@ -3424,7 +3425,7 @@ status.waiting = "Waiting"
 status.running = "Running"
 status.success = "Success"
 status.failure = "Failure"
-status.cancelled = "Cancelled"
+status.cancelled = "Canceled"
 status.skipped = "Skipped"
 status.blocked = "Blocked"
 

templates/repo/settings/options.tmpl

@@ -86,10 +86,12 @@
 					<a target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io/en-us/usage/repo-mirror/#pulling-from-a-remote-repository">{{$.locale.Tr "repo.settings.mirror_settings.docs.doc_link_title"}}</a><br>
 				{{else if $onlyNewPushMirrorsEnabled}}
 					{{$.locale.Tr "repo.settings.mirror_settings.docs.disabled_pull_mirror.instructions"}}
+					{{$.locale.Tr "repo.settings.mirror_settings.docs.more_information_if_disabled"}}
 					<a target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io/en-us/usage/repo-mirror/#pulling-from-a-remote-repository">{{$.locale.Tr "repo.settings.mirror_settings.docs.doc_link_title"}}</a><br>
 				{{else if $onlyNewPullMirrorsEnabled}}
 					{{$.locale.Tr "repo.settings.mirror_settings.docs.disabled_push_mirror.instructions"}}
 					{{$.locale.Tr "repo.settings.mirror_settings.docs.disabled_push_mirror.pull_mirror_warning"}}
+					{{$.locale.Tr "repo.settings.mirror_settings.docs.more_information_if_disabled"}}
 					<a target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io/en-us/usage/repo-mirror/#pulling-from-a-remote-repository">{{$.locale.Tr "repo.settings.mirror_settings.docs.doc_link_title"}}</a><br><br>
 					{{$.locale.Tr "repo.settings.mirror_settings.docs.disabled_push_mirror.info"}}
 					{{if $existingPushMirror}}

templates/status/500.tmpl

@@ -42,7 +42,7 @@
 				{{end}}
 				<div class="center gt-mt-5">
 					{{if or .SignedUser.IsAdmin .ShowFooterVersion}}<p>{{.locale.Tr "admin.config.app_ver"}}: {{AppVer}}</p>{{end}}
-					{{if .SignedUser.IsAdmin}}<p>{{.locale.Tr "error.report_message" "https://github.com/go-gitea/gitea/issues" | Str2html}}</p>{{end}}
+					{{if .SignedUser.IsAdmin}}<p>{{.locale.Tr "error.report_message" "https://github.com/go-gitea/gitea/issues" "GitHub" | Str2html}}</p>{{end}}
 				</div>
 			</div>
 		</div>

tests/e2e/example.test.e2e.js

@@ -24,7 +24,7 @@ test('Test Register Form', async ({page}, workerInfo) => {
   // Make sure we routed to the home page. Else login failed.
   await expect(page.url()).toBe(`${workerInfo.project.use.baseURL}/`);
   await expect(page.locator('.dashboard-navbar span>img.ui.avatar')).toBeVisible();
-  await expect(page.locator('.ui.positive.message.flash-success')).toHaveText('Account was successfully created.');
+  await expect(page.locator('.ui.positive.message.flash-success')).toHaveText('Account was successfully created. Welcome!');
 
   save_visual(page);
 });