Merge remote-tracking branch 'forgejo/forgejo-development' into wip-forgejo

Author: earl-warren

options/locale/locale_en-US.ini

@@ -448,7 +448,7 @@ activate_email.text = Please click the following link to verify your email addre
 
 admin.new_user.subject = New user %s just signed up
 admin.new_user.user_info = User Information
-admin.new_user.text = Please <a href="%s">click here</a> to manage the user from the admin panel.
+admin.new_user.text = Please <a href="%s">click here</a> to manage this user from the admin panel.
 
 register_notify = Welcome to Forgejo
 register_notify.title = %[1]s, welcome to %[2]s
@@ -633,7 +633,7 @@ settings = User Settings
 
 form.name_reserved = The username "%s" is reserved.
 form.name_pattern_not_allowed = The pattern "%s" is not allowed in a username.
-form.name_chars_not_allowed = User name "%s" contains invalid characters.
+form.name_chars_not_allowed = Username "%s" contains invalid characters.
 
 [settings]
 profile = Profile
@@ -658,7 +658,7 @@ blocked_users = Blocked Users
 public_profile = Public Profile
 biography_placeholder = Tell us a little bit about yourself! (You can use Markdown)
 location_placeholder = Share your approximate location with others
-profile_desc = Control how your profile is show to other users. Your primary email address will be used for notifications, password recovery and web-based Git operations.
+profile_desc = Control how your profile is shown to other users. Your primary email address will be used for notifications, password recovery and web-based Git operations.
 password_username_disabled = Non-local users are not allowed to change their username. Please contact your site administrator for more details.
 full_name = Full Name
 website = Website
@@ -988,7 +988,7 @@ all_branches = All branches
 fork_no_valid_owners = This repository can not be forked because there are no valid owners.
 use_template = Use this template
 clone_in_vsc = Clone in VS Code
-clone_in_vscodium = Clone in VS Codium
+clone_in_vscodium = Clone in VSCodium
 download_zip = Download ZIP
 download_tar = Download TAR.GZ
 download_bundle = Download BUNDLE
@@ -1027,7 +1027,7 @@ mirror_sync = synced
 mirror_sync_on_commit = Sync when commits are pushed
 mirror_address = Clone From URL
 mirror_address_desc = Put any required credentials in the Authorization section.
-mirror_address_url_invalid = The provided URL is invalid. You must escape all components of the url correctly.
+mirror_address_url_invalid = The provided URL is invalid. You must escape all components of the URL correctly.
 mirror_address_protocol_invalid = The provided URL is invalid. Only http(s):// or git:// locations can be used for mirroring.
 mirror_lfs = Large File Storage (LFS)
 mirror_lfs_desc = Activate mirroring of LFS data.
@@ -1789,7 +1789,7 @@ pulls.required_status_check_missing = Some required checks are missing.
 pulls.required_status_check_administrator = As an administrator, you may still merge this pull request.
 pulls.blocked_by_approvals = "This pull request doesn't have enough approvals yet. %d of %d approvals granted."
 pulls.blocked_by_rejection = "This pull request has changes requested by an official reviewer."
-pulls.blocked_by_official_review_requests = "This pull request has official review requests."
+pulls.blocked_by_official_review_requests = "This pull request is blocked because it is missing approval from one or more official reviewers."
 pulls.blocked_by_outdated_branch = "This pull request is blocked because it's outdated."
 pulls.blocked_by_changed_protected_files_1= "This pull request is blocked because it changes a protected file:"
 pulls.blocked_by_changed_protected_files_n= "This pull request is blocked because it changes protected files:"