Grammar

- Corrections of tense, number, part of speech and other grammatical
  aspects
- Revert errors introduced in b861d86

Author: Dominik Rubo

options/locale/locale_en-US.ini

@@ -481,7 +481,7 @@ authorize_application_description = If you grant access, it will be able to acce
 authorize_application_with_scopes = With scopes: %s
 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 have tried to authorize.
+authorization_failed_desc = The authorization failed because we detected an invalid request. Please contact the maintainer of the app you 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="%s">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
@@ -702,7 +702,7 @@ block.info_3 = send you notifications by @mentioning your username
 block.info_4 = inviting you as a collaborator to their repositories
 block.info_5 = starring, forking or watching on repositories
 block.info_6 = opening and commenting on issues or pull requests
-block.info_7 = reacting on your comments in issues or pull requests
+block.info_7 = reacting to your comments in issues or pull requests
 block.user_to_block = User to block
 block.note = Note
 block.note.title = Optional note:
@@ -855,7 +855,7 @@ gpg_key_matched_identities_long=The embedded identities in this key match the fo
 gpg_key_verified=Verified Key
 gpg_key_verified_long=Key has been verified with a token and can be used to verify commits matching any activated email addresses for this user in addition to any matched identities for this key.
 gpg_key_verify=Verify
-gpg_invalid_token_signature = The provided GPG key, signature and token do not match or token is out-of-date.
+gpg_invalid_token_signature = The provided GPG key, signature and token do not match or the token is out-of-date.
 gpg_token_required = You must provide a signature for the below token
 gpg_token = Token
 gpg_token_help = You can generate a signature using:
@@ -865,7 +865,7 @@ verify_gpg_key_success = GPG key "%s" has been verified.
 ssh_key_verified=Verified Key
 ssh_key_verified_long=Key has been verified with a token and can be used to verify commits matching any activated email addresses for this user.
 ssh_key_verify=Verify
-ssh_invalid_token_signature = The provided SSH key, signature or token do not match or token is out-of-date.
+ssh_invalid_token_signature = The provided SSH key, signature or token do not match or the token is out-of-date.
 ssh_token_required = You must provide a signature for the below token
 ssh_token = Token
 ssh_token_help = You can generate a signature using:
@@ -886,7 +886,7 @@ gpg_key_deletion = Remove GPG Key
 ssh_principal_deletion = Remove SSH Certificate Principal
 ssh_key_deletion_desc = Removing an SSH key revokes its access to your account. Continue?
 gpg_key_deletion_desc = Removing a GPG key un-verifies commits signed by it. Continue?
-ssh_principal_deletion_desc = Removing a SSH Certificate Principal revokes its access to your account. Continue?
+ssh_principal_deletion_desc = Removing an SSH Certificate Principal revokes its access to your account. Continue?
 ssh_key_deletion_success = The SSH key has been removed.
 gpg_key_deletion_success = The GPG key has been removed.
 ssh_principal_deletion_success = The principal has been removed.
@@ -976,7 +976,7 @@ twofa_not_enrolled = Your account is not currently enrolled in two-factor authen
 twofa_disable = Disable Two-Factor Authentication
 twofa_scratch_token_regenerate = Regenerate Single-Use Recovery Key
 twofa_scratch_token_regenerated = Your single-use recovery key is now %s. Store it in a safe place, as it will not be shown again.
-twofa_enroll = Enroll into Two-Factor Authentication
+twofa_enroll = Enroll in Two-Factor Authentication
 twofa_disable_note = You can disable two-factor authentication if needed.
 twofa_disable_desc = Disabling two-factor authentication will make your account less secure. Continue?
 regenerate_scratch_token_desc = If you misplaced your recovery key or have already used it to sign in, you can reset it here.
@@ -1164,8 +1164,8 @@ template.issue_labels = Issue Labels
 template.one_item = Must select at least one template item
 template.invalid = Must select a template repository
 
-archive.title = This repo is archived. You can view files and clone it. You cannot open issues, pull requests or push a commit.
-archive.title_date = This repository has been archived on %s. You can view files and clone it. You cannot open issues, pull requests or push a commit.
+archive.title = This repo is archived. You can view files and clone it. You cannot open issues or pull requests or push a commit.
+archive.title_date = This repository has been archived on %s. You can view files and clone it. You cannot open issues or pull requests or push a commit.
 archive.issue.nocomment = This repo is archived. You cannot comment on issues.
 archive.pull.nocomment = This repo is archived. You cannot comment on pull requests.
 
@@ -1829,7 +1829,7 @@ issues.review.requested = Review pending
 issues.review.rejected = Changes requested
 issues.review.stale = Updated since approval
 issues.review.unofficial = Uncounted approval
-issues.assignee.error = Not all assignees was added due to an unexpected error.
+issues.assignee.error = Not all assignees were added due to an unexpected error.
 issues.reference_issue.body = Body
 issues.content_history.deleted = deleted
 issues.content_history.edited = edited
@@ -2159,7 +2159,7 @@ settings.public_access = Public Access
 settings.public_access_desc = Configure public visitor's access permissions to override the defaults of this repository.
 settings.public_access.docs.not_set = Not Set: no extra public access permission. The visitor's permission follows the repository's visibility and member permissions.
 settings.public_access.docs.anonymous_read = Anonymous Read: users who are not logged in can access the unit with read permission.
-settings.public_access.docs.everyone_read = Everyone Read: all logged-in users can access the unit with read permission. Read permission of issues/pull-requests units also means users can create new issues/pull-requests.
+settings.public_access.docs.everyone_read = Everyone Read: all logged-in users can access the unit with read permission. Read permission of issue/pull-request units also means users can create new issues/pull requests.
 settings.public_access.docs.everyone_write = Everyone Write: all logged-in users have write permission to the unit. Only Wiki unit supports this permission.
 settings.collaboration = Collaborators
 settings.collaboration.admin = Administrator
@@ -2274,7 +2274,7 @@ settings.transfer_abort_invalid = You cannot cancel a non existent repository tr
 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.
+settings.transfer_in_progress = There is currently an ongoing transfer. Please cancel it if you would like to transfer this repository to another user.
 settings.transfer_notices_1 = - You will lose access to the repository if you transfer it to an individual user.
 settings.transfer_notices_2 = - You will keep access to the repository if you transfer it to an organization that you (co-)own.
 settings.transfer_notices_3 = - If the repository is private and is transferred to an individual user, this action makes sure that the user does have at least read permission (and changes permissions if necessary).
@@ -2326,8 +2326,8 @@ settings.team_not_in_organization = The team is not in the same organization as
 settings.teams = Teams
 settings.add_team = Add Team
 settings.add_team_duplicate = Team already has the repository
-settings.add_team_success = The team now have access to the repository.
-settings.change_team_permission_tip = Team's permission is set on the team setting page and can't be changed per repository
+settings.add_team_success = The team now has access to the repository.
+settings.change_team_permission_tip = Team's permission is set on the team settings page and can't be changed per repository
 settings.delete_team_tip = This team has access to all repositories and can't be removed
 settings.remove_team_success = The team's access to the repository has been removed.
 settings.add_webhook = Add Webhook
@@ -2772,7 +2772,7 @@ branch.new_branch_from = Create new branch from "%s"
 branch.renamed = Branch %s was renamed to %s.
 branch.rename_default_or_protected_branch_error = Only admins can rename default or protected branches.
 branch.rename_protected_branch_failed = This branch is protected by glob-based protection rules.
-branch.commits_divergence_from = Commits divergence: %[1]d behind and %[2]d ahead of %[3]s
+branch.commits_divergence_from = Commit divergence: %[1]d behind and %[2]d ahead of %[3]s
 branch.commits_no_divergence = The same as branch %[1]s
 
 tag.create_tag = Create tag %s
@@ -2853,7 +2853,7 @@ settings.update_setting_success = Organization settings have been updated.
 
 settings.rename = Rename Organization
 settings.rename_desc = Changing the organization name will also change your organization's URL and free the old name.
-settings.rename_success = Organization %[1]s have been renamed to %[2]s successfully.
+settings.rename_success = Organization %[1]s has been renamed to %[2]s successfully.
 settings.rename_no_change = Organization name is no change.
 settings.rename_new_org_name = New Organization Name
 settings.rename_failed = Rename Organization failed because of internal error
@@ -3261,15 +3261,15 @@ auths.oauth2_map_group_to_team = Map claimed groups to Organization teams. (Opti
 auths.oauth2_map_group_to_team_removal = Remove users from synchronized teams if user does not belong to corresponding group.
 auths.enable_auto_register = Enable Auto Registration
 auths.sspi_auto_create_users = Automatically create users
-auths.sspi_auto_create_users_helper = Allow SSPI auth method to automatically create new accounts for users that login for the first time
+auths.sspi_auto_create_users_helper = Allow SSPI auth method to automatically create new accounts for users that log in for the first time
 auths.sspi_auto_activate_users = Automatically activate users
 auths.sspi_auto_activate_users_helper = Allow SSPI auth method to automatically activate new users
 auths.sspi_strip_domain_names = Remove domain names from usernames
 auths.sspi_strip_domain_names_helper = If checked, domain names will be removed from logon names (eg. "DOMAIN\user" and "[email protected]" both will become just "user").
 auths.sspi_separator_replacement = Separator to use instead of \, / and @
 auths.sspi_separator_replacement_helper = The character to use to replace the separators of down-level logon names (eg. the \ in "DOMAIN\user") and user principal names (eg. the @ in "[email protected]").
 auths.sspi_default_language = Default user language
-auths.sspi_default_language_helper = Default language for users automatically created by SSPI auth method. Leave empty if you prefer language to be automatically detected.
+auths.sspi_default_language_helper = Default language for users automatically created by SSPI auth method. Leave empty if you prefer the language to be automatically detected.
 auths.tips = Tips
 auths.tips.oauth2.general = OAuth2 Authentication
 auths.tips.oauth2.general.tip = When registering a new OAuth2 authentication, the callback/redirect URL should be:
@@ -3500,7 +3500,7 @@ notices.delete_success = The system notices have been deleted.
 self_check.no_problem_found = No problem found yet.
 self_check.startup_warnings = Startup warnings:
 self_check.database_collation_mismatch = Expect database to use collation: %s
-self_check.database_collation_case_insensitive = Database is using a collation %s, which is an insensitive collation. Although Gitea could work with it, there might be some rare cases which don't work as expected.
+self_check.database_collation_case_insensitive = Database is using collation %s, which is an insensitive collation. Although Gitea could work with it, there might be some rare cases which don't work as expected.
 self_check.database_inconsistent_collation_columns = Database is using collation %s, but these columns are using mismatched collations. It might cause some unexpected problems.
 self_check.database_fix_mysql = For MySQL/MariaDB users, you could use the "gitea doctor convert" command to fix the collation problems, or you could also fix the problem by "ALTER ... COLLATE ..." SQLs manually.
 self_check.database_fix_mssql = For MSSQL users, you could only fix the problem by "ALTER ... COLLATE ..." SQLs manually at the moment.
@@ -3627,7 +3627,7 @@ versions.view_all = View all
 dependency.id = ID
 dependency.version = Version
 search_in_external_registry = Search in %s
-alpine.registry = Setup this registry by adding the url in your <code>/etc/apk/repositories</code> file:
+alpine.registry = Set up this registry by adding the url in your <code>/etc/apk/repositories</code> file:
 alpine.registry.key = Download the registry public RSA key into the <code>/etc/apk/keys/</code> folder to verify the index signature:
 alpine.registry.info = Choose $branch and $repository from the list below.
 alpine.install = To install the package, run the following command:
@@ -3640,18 +3640,18 @@ arch.install = Sync package with pacman:
 arch.repository = Repository Info
 arch.repository.repositories = Repositories
 arch.repository.architectures = Architectures
-cargo.registry = Setup this registry in the Cargo configuration file (for example <code>~/.cargo/config.toml</code>):
+cargo.registry = Set up this registry in the Cargo configuration file (for example <code>~/.cargo/config.toml</code>):
 cargo.install = To install the package using Cargo, run the following command:
-chef.registry = Setup this registry in your <code>~/.chef/config.rb</code> file:
+chef.registry = Set up this registry in your <code>~/.chef/config.rb</code> file:
 chef.install = To install the package, run the following command:
-composer.registry = Setup this registry in your <code>~/.composer/config.json</code> file:
+composer.registry = Set up this registry in your <code>~/.composer/config.json</code> file:
 composer.install = To install the package using Composer, run the following command:
 composer.dependencies = Dependencies
 composer.dependencies.development = Development Dependencies
 conan.details.repository = Repository
-conan.registry = Setup this registry from the command line:
+conan.registry = Set up this registry from the command line:
 conan.install = To install the package using Conan, run the following command:
-conda.registry = Setup this registry as a Conda repository in your <code>.condarc</code> file:
+conda.registry = Set up this registry as a Conda repository in your <code>.condarc</code> file:
 conda.install = To install the package using Conda, run the following command:
 container.details.type = Image Type
 container.details.platform = Platform
@@ -3663,9 +3663,9 @@ container.layers = Image Layers
 container.labels = Labels
 container.labels.key = Key
 container.labels.value = Value
-cran.registry = Setup this registry in your <code>Rprofile.site</code> file:
+cran.registry = Set up this registry in your <code>Rprofile.site</code> file:
 cran.install = To install the package, run the following command:
-debian.registry = Setup this registry from the command line:
+debian.registry = Set up this registry from the command line:
 debian.registry.info = Choose $distribution and $component from the list below.
 debian.install = To install the package, run the following command:
 debian.repository = Repository Info
@@ -3674,16 +3674,16 @@ debian.repository.components = Components
 debian.repository.architectures = Architectures
 generic.download = Download package from the command line:
 go.install = Install the package from the command line:
-helm.registry = Setup this registry from the command line:
+helm.registry = Set up this registry from the command line:
 helm.install = To install the package, run the following command:
-maven.registry = Setup this registry in your project <code>pom.xml</code> file:
+maven.registry = Set up this registry in your project <code>pom.xml</code> file:
 maven.install = To use the package include the following in the <code>dependencies</code> block in the <code>pom.xml</code> file:
 maven.install2 = Run via command line:
 maven.download = To download the dependency, run via command line:
-nuget.registry = Setup this registry from the command line:
+nuget.registry = Set up this registry from the command line:
 nuget.install = To install the package using NuGet, run the following command:
 nuget.dependency.framework = Target Framework
-npm.registry = Setup this registry in your project <code>.npmrc</code> file:
+npm.registry = Set up this registry in your project <code>.npmrc</code> file:
 npm.install = To install the package using npm, run the following command:
 npm.install2 = or add it to the package.json file:
 npm.dependencies = Dependencies
@@ -3695,7 +3695,7 @@ npm.details.tag = Tag
 pub.install = To install the package using Dart, run the following command:
 pypi.requires = Requires Python
 pypi.install = To install the package using pip, run the following command:
-rpm.registry = Setup this registry from the command line:
+rpm.registry = Set up this registry from the command line:
 rpm.distros.redhat = on RedHat based distributions
 rpm.distros.suse = on SUSE based distributions
 rpm.install = To install the package, run the following command:
@@ -3708,7 +3708,7 @@ rubygems.dependencies.runtime = Runtime Dependencies
 rubygems.dependencies.development = Development Dependencies
 rubygems.required.ruby = Requires Ruby version
 rubygems.required.rubygems = Requires RubyGem version
-swift.registry = Setup this registry from the command line:
+swift.registry = Set up this registry from the command line:
 swift.install = Add the package in your <code>Package.swift</code> file:
 swift.install2 = and run the following command:
 vagrant.install = To add a Vagrant box, run the following command: