Merge remote-tracking branch 'upstream/main' into limit-repo-size

options/license/HPND-export-US

@@ -0,0 +1,5 @@
+Copyright (C) 1990 by the Massachusetts Institute of Technology
+
+Export of this software from the United States of America may  require a specific license from the United States Government.  It is the responsibility of any person or organization contemplating  export to obtain such a license before exporting.
+
+WITHIN THAT CONSTRAINT, permission to use, copy, modify, and  distribute this software and its documentation for any purpose and  without fee is hereby granted, provided that the above copyright  notice appear in all copies and that both that copyright notice and  this permission notice appear in supporting documentation, and that  the name of M.I.T. not be used in advertising or publicity pertaining  to distribution of the software without specific, written prior  permission. M.I.T. makes no representations about the suitability of  this software for any purpose. It is provided "as is" without express  or implied warranty.

options/locale/locale_en-US.ini

@@ -95,7 +95,7 @@ copy_content = Copy content
 copy_branch = Copy branch name
 copy_success = Copied!
 copy_error = Copy failed
-copy_type_unsupported = This file type can not be copied
+copy_type_unsupported = This file type cannot be copied
 
 write = Write
 preview = Preview
@@ -325,7 +325,7 @@ invalid_code = Your confirmation code is invalid or has expired.
 reset_password_helper = Recover Account
 reset_password_wrong_user = You are signed in as %s, but the account recovery link is for %s
 password_too_short = Password length cannot be less than %d characters.
-non_local_account = Non-local users can not update their password through the Gitea web interface.
+non_local_account = Non-local users cannot update their password through the Gitea web interface.
 verify = Verify
 scratch_code = Scratch code
 use_scratch_code = Use a scratch code
@@ -507,10 +507,10 @@ cannot_add_org_to_team = An organization cannot be added as a team member.
 duplicate_invite_to_team = The user was already invited as a team member.
 organization_leave_success = You have successfully left the organization %s.
 
-invalid_ssh_key = Can not verify your SSH key: %s
-invalid_gpg_key = Can not verify your GPG key: %s
+invalid_ssh_key = Cannot verify your SSH key: %s
+invalid_gpg_key = Cannot verify your GPG key: %s
 invalid_ssh_principal = Invalid principal: %s
-unable_verify_ssh_key = "Can not verify the SSH key; double-check it for mistakes."
+unable_verify_ssh_key = "Cannot verify the SSH key; double-check it for mistakes."
 auth_failed = Authentication failed: %v
 
 still_own_repo = "Your account owns one or more repositories; delete or transfer them first."
@@ -618,7 +618,7 @@ new_password = New Password
 retype_new_password = Re-Type 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 can not update their password through the Gitea web interface.
+password_change_disabled = Non-local users cannot update their password through the Gitea web interface.
 
 emails = Email Addresses
 manage_emails = Manage Email Addresses
@@ -813,7 +813,7 @@ orgs_none = You are not a member of any organizations.
 repos_none = You do not own any repositories
 
 delete_account = Delete Your Account
-delete_prompt = This operation will permanently delete your user account. It <strong>CAN NOT</strong> be undone.
+delete_prompt = This operation will permanently delete your user account. It <strong>CANNOT</strong> be undone.
 delete_with_all_comments = Your account is younger than %s. To avoid ghost comments, all issue/PR comments will be deleted with it.
 confirm_delete_account = Confirm Deletion
 delete_account_title = Delete User Account
@@ -980,7 +980,7 @@ migrate.clone_address_desc = The HTTP(S) or Git 'clone' URL of an existing repos
 migrate.github_token_desc = You can put one or more tokens with comma separated here to make migrating faster because of GitHub API rate limit. WARN: Abusing this feature may violate the service provider's policy and lead to account blocking.
 migrate.clone_local_path = or a local server path
 migrate.permission_denied = You are not allowed to import local repositories.
-migrate.permission_denied_blocked = You can not import from disallowed hosts, please ask the admin to check ALLOWED_DOMAINS/ALLOW_LOCALNETWORKS/BLOCKED_DOMAINS settings.
+migrate.permission_denied_blocked = You cannot import from disallowed hosts, please ask the admin to check ALLOWED_DOMAINS/ALLOW_LOCALNETWORKS/BLOCKED_DOMAINS settings.
 migrate.invalid_local_path = "The local path is invalid. It does not exist or is not a directory."
 migrate.invalid_lfs_endpoint = The LFS endpoint is not valid.
 migrate.failed = Migration failed: %v
@@ -1593,7 +1593,7 @@ pulls.wrong_commit_id = "commit id must be a commit id on the target branch"
 
 pulls.no_merge_desc = This pull request cannot be merged because all repository merge options are disabled.
 pulls.no_merge_helper = Enable merge options in the repository settings or merge the pull request manually.
-pulls.no_merge_wip = This pull request can not be merged because it is marked as being a work in progress.
+pulls.no_merge_wip = This pull request cannot be merged because it is marked as being a work in progress.
 pulls.no_merge_not_ready = This pull request is not ready to be merged, check review status and status checks.
 pulls.no_merge_access = You are not authorized to merge this pull request.
 pulls.merge_pull_request = Create merge commit
@@ -1928,8 +1928,8 @@ settings.update_settings_success = The repository settings have been updated.
 settings.confirm_delete = Delete Repository
 settings.add_collaborator = Add Collaborator
 settings.add_collaborator_success = The collaborator has been added.
-settings.add_collaborator_inactive_user = Can not add an inactive user as a collaborator.
-settings.add_collaborator_owner = Can not add an owner as a collaborator.
+settings.add_collaborator_inactive_user = Cannot add an inactive user as a collaborator.
+settings.add_collaborator_owner = Cannot add an owner as a collaborator.
 settings.add_collaborator_duplicate = The collaborator is already added to this repository.
 settings.delete_collaborator = Remove
 settings.collaborator_deletion = Remove Collaborator
@@ -2074,7 +2074,7 @@ settings.branches = Branches
 settings.protected_branch = Branch Protection
 settings.protected_branch_can_push = Allow push?
 settings.protected_branch_can_push_yes = You can push
-settings.protected_branch_can_push_no = You can not push
+settings.protected_branch_can_push_no = You cannot push
 settings.branch_protection = Branch Protection for Branch '<b>%s</b>'
 settings.protect_this_branch = Enable Branch Protection
 settings.protect_this_branch_desc = Prevents deletion and restricts Git pushing and merging to the branch.
@@ -2326,7 +2326,7 @@ tag.create_success = Tag '%s' has been created.
 
 topic.manage_topics = Manage Topics
 topic.done = Done
-topic.count_prompt = You can not select more than 25 topics
+topic.count_prompt = You cannot select more than 25 topics
 topic.format_prompt = Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 find_file.go_to_file = Go to file
@@ -3064,7 +3064,7 @@ raw_minutes = minutes
 
 [dropzone]
 default_message = Drop files or click here to upload.
-invalid_input_type = You can not upload files of this type.
+invalid_input_type = You cannot upload files of this type.
 file_too_big = File size ({{filesize}} MB) exceeds the maximum size of ({{maxFilesize}} MB).
 remove_file = Remove file