-
-
Notifications
You must be signed in to change notification settings - Fork 5.9k
Fixed all grammatical errors in locale_en-US.ini #35053
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
2abe159
Fixed all grammatical errors
Joshdike 40be7c0
Merge branch 'main' into Joshdike
Joshdike f870499
Made suggested changes to lines 323, 353, 1105, 1165 & 1195
Joshdike 2b38446
Merge branch 'main' into Joshdike
Joshdike f88eb8b
Merge branch 'main' into Joshdike
Joshdike 9b3afc1
Merge branch 'main' into Joshdike
Joshdike 38bef79
edited 692 and 3834 as requested
Joshdike c2dd18a
update: block.block.org = Block user from organization
wxiaoguang 2d38519
Merge branch 'main' into Joshdike
wxiaoguang File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -358,7 +358,7 @@ no_reply_address = Hidden Email Domain | |
no_reply_address_helper = Domain name for users with a hidden email address. For example, the username 'joe' will be logged in Git as '[email protected]' if the hidden email domain is set to 'noreply.example.org'. | ||
password_algorithm = Password Hash Algorithm | ||
invalid_password_algorithm = Invalid password hash algorithm | ||
password_algorithm_helper = Set the password hashing algorithm. Algorithms have differing requirements and strength. The argon2 algorithm is rather secure but uses a lot of memory and may be inappropriate for small systems. | ||
password_algorithm_helper = Set the password hashing algorithm. Algorithms have differing requirements and strengths. The argon2 algorithm is rather secure but uses a lot of memory and may be inappropriate for small systems. | ||
enable_update_checker = Enable Update Checker | ||
enable_update_checker_helper = Checks for new version releases periodically by connecting to gitea.io. | ||
env_config_keys = Environment Configuration | ||
|
@@ -452,7 +452,7 @@ use_scratch_code = Use a scratch code | |
twofa_scratch_used = You have used your scratch code. You have been redirected to the two-factor settings page so you may remove your device enrollment or generate a new scratch code. | ||
twofa_passcode_incorrect = Your passcode is incorrect. If you misplaced your device, use your scratch code to sign in. | ||
twofa_scratch_token_incorrect = Your scratch code is incorrect. | ||
twofa_required = You must setup Two-Factor Authentication to get access to repositories, or try to login again. | ||
twofa_required = You must set up Two-Factor Authentication to get access to repositories, or try to log in again. | ||
login_userpass = Sign In | ||
login_openid = OpenID | ||
oauth_signup_tab = Register New Account | ||
|
@@ -464,7 +464,7 @@ oauth_signin_submit = Link Account | |
oauth.signin.error.general = There was an error processing the authorization request: %s. If this error persists, please contact the site administrator. | ||
oauth.signin.error.access_denied = The authorization request was denied. | ||
oauth.signin.error.temporarily_unavailable = Authorization failed because the authentication server is temporarily unavailable. Please try again later. | ||
oauth_callback_unable_auto_reg = Auto Registration is enabled, but OAuth2 Provider %[1]s returned missing fields: %[2]s, unable to create an account automatically, please create or link to an account, or contact the site administrator. | ||
oauth_callback_unable_auto_reg = Auto Registration is enabled, but OAuth2 Provider %[1]s returned missing fields: %[2]s, unable to create an account automatically. Please create or link to an account, or contact the site administrator. | ||
openid_connect_submit = Connect | ||
openid_connect_title = Connect to an existing account | ||
openid_connect_desc = The chosen OpenID URI is unknown. Associate it with a new account here. | ||
|
@@ -477,7 +477,7 @@ email_domain_blacklisted = You cannot register with your email address. | |
authorize_application = Authorize Application | ||
authorize_redirect_notice = You will be redirected to %s if you authorize this application. | ||
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_application_description = If you grant access, it will be able to access and write to all your account information, including private repos and organisations. | ||
authorize_application_with_scopes = With scopes: %s | ||
authorize_title = Authorize "%s" to access your account? | ||
authorization_failed = Authorization failed | ||
|
@@ -507,7 +507,7 @@ activate_email.text = Please click the following link to verify your email addre | |
register_notify = Welcome to %s | ||
register_notify.title = %[1]s, welcome to %[2]s | ||
register_notify.text_1 = This is your registration confirmation email for %s! | ||
register_notify.text_2 = You can now login via username: %s. | ||
register_notify.text_2 = You can now log in via username: %s. | ||
register_notify.text_3 = If this account has been created for you, please <a href="%s">set your password</a> first. | ||
reset_password = Recover your account | ||
|
@@ -689,7 +689,7 @@ form.name_chars_not_allowed = User name "%s" contains invalid characters. | |
block.block = Block | ||
block.block.user = Block user | ||
block.block.org = Block user for organization | ||
block.block.org = Block user from organization | ||
Joshdike marked this conversation as resolved.
Show resolved
Hide resolved
|
||
block.block.failure = Failed to block user: %s | ||
block.unblock = Unblock | ||
block.unblock.failure = Failed to unblock user: %s | ||
|
@@ -733,7 +733,7 @@ webauthn = Two-Factor Authentication (Security Keys) | |
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 = You are not allowed to change your username. Please contact your site administrator for more details. | ||
password_full_name_disabled = You are not allowed to change your full name. Please contact your site administrator for more details. | ||
full_name = Full Name | ||
|
@@ -812,7 +812,7 @@ activations_pending = Activations Pending | |
can_not_add_email_activations_pending = There is a pending activation, try again in a few minutes if you want to add a new email. | ||
delete_email = Remove | ||
email_deletion = Remove Email Address | ||
email_deletion_desc = The email address and related information will be removed from your account. Git commits by this email address will remain unchanged. Continue? | ||
email_deletion_desc = This email address and related information will be removed from your account. Git commits by this email address will remain unchanged. Continue? | ||
email_deletion_success = The email address has been removed. | ||
theme_update_success = Your theme was updated. | ||
theme_update_error = The selected theme does not exist. | ||
|
@@ -1102,7 +1102,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. Make sure all components of the URL are escaped 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. | ||
|
@@ -1162,8 +1162,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, but cannot push or open issues or pull requests. | ||
archive.title_date = This repository has been archived on %s. You can view files and clone it, but cannot push or open issues or pull requests. | ||
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.issue.nocomment = This repo is archived. You cannot comment on issues. | ||
archive.pull.nocomment = This repo is archived. You cannot comment on pull requests. | ||
|
||
|
@@ -1192,7 +1192,7 @@ migrate_items_releases = Releases | |
migrate_repo = Migrate Repository | ||
migrate.clone_address = Migrate / Clone From URL | ||
migrate.clone_address_desc = The HTTP(S) or Git 'clone' URL of an existing repository | ||
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.github_token_desc = You can put one or more tokens here separated by commas to make migrating faster by circumventing the GitHub API rate limit. WARNING: Abusing this feature may violate the service provider's policy and may lead to getting your account(s) blocked. | ||
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 cannot import from disallowed hosts, please ask the admin to check ALLOWED_DOMAINS/ALLOW_LOCALNETWORKS/BLOCKED_DOMAINS settings. | ||
|
@@ -1254,7 +1254,7 @@ create_new_repo_command = Creating a new repository on the command line | |
push_exist_repo = Pushing an existing repository from the command line | ||
empty_message = This repository does not contain any content. | ||
broken_message = The Git data underlying this repository cannot be read. Contact the administrator of this instance or delete this repository. | ||
no_branch = This repository doesn’t have any branches. | ||
no_branch = This repository doesn't have any branches. | ||
code = Code | ||
code.desc = Access source code, files, commits and branches. | ||
|
@@ -1400,8 +1400,8 @@ editor.failed_to_commit = Failed to commit changes. | |
editor.failed_to_commit_summary = Error Message: | ||
editor.fork_create = Fork Repository to Propose Changes | ||
editor.fork_create_description = You can not edit this repository directly. Instead you can create a fork, make edits and create a pull request. | ||
editor.fork_edit_description = You can not edit this repository directly. The changes will be written to your fork <b>%s</b>, so you can create a pull request. | ||
editor.fork_create_description = You cannot edit this repository directly. Instead you can create a fork, make edits and create a pull request. | ||
editor.fork_edit_description = You cannot edit this repository directly. The changes will be written to your fork <b>%s</b>, so you can create a pull request. | ||
editor.fork_not_editable = You have forked this repository but your fork is not editable. | ||
editor.fork_failed_to_push_branch = Failed to push branch %s to your repository. | ||
editor.fork_branch_exists = Branch "%s" already exists in your fork, please choose a new branch name. | ||
|
@@ -1700,7 +1700,7 @@ issues.lock_no_reason = "locked and limited conversation to collaborators %s" | |
issues.unlock_comment = "unlocked this conversation %s" | ||
issues.lock_confirm = Lock | ||
issues.unlock_confirm = Unlock | ||
issues.lock.notice_1 = - Other users can’t add new comments to this issue. | ||
issues.lock.notice_1 = - Other users cannot add new comments to this issue. | ||
issues.lock.notice_2 = - You and other collaborators with access to this repository can still leave comments that others can see. | ||
issues.lock.notice_3 = - You can always unlock this issue again in the future. | ||
issues.unlock.notice_1 = - Everyone would be able to comment on this issue once more. | ||
|
@@ -1869,7 +1869,7 @@ pulls.select_commit_hold_shift_for_range = Select commit. Hold shift + click to | |
pulls.review_only_possible_for_full_diff = Review is only possible when viewing the full diff | ||
pulls.filter_changes_by_commit = Filter by commit | ||
pulls.nothing_to_compare = These branches are equal. There is no need to create a pull request. | ||
pulls.nothing_to_compare_have_tag = The selected branch/tag are equal. | ||
pulls.nothing_to_compare_have_tag = The selected branches/tags are equal. | ||
wxiaoguang marked this conversation as resolved.
Show resolved
Hide resolved
|
||
pulls.nothing_to_compare_and_allow_empty_pr = These branches are equal. This PR will be empty. | ||
pulls.has_pull_request = `A pull request between these branches already exists: <a href="%[1]s">%[2]s#%[3]d</a>` | ||
pulls.create = Create Pull Request | ||
|
@@ -2032,7 +2032,7 @@ milestones.filter_sort.most_issues = Most issues | |
milestones.filter_sort.least_issues = Least issues | ||
|
||
signing.will_sign = This commit will be signed with key "%s". | ||
signing.wont_sign.error = There was an error whilst checking if the commit could be signed. | ||
signing.wont_sign.error = There was an error while checking if the commit could be signed. | ||
signing.wont_sign.nokey = There is no key available to sign this commit. | ||
signing.wont_sign.never = Commits are never signed. | ||
signing.wont_sign.always = Commits are always signed. | ||
|
@@ -2541,7 +2541,7 @@ settings.block_on_official_review_requests_desc = Merging will not be possible w | |
settings.block_outdated_branch = Block merge if pull request is outdated | ||
settings.block_outdated_branch_desc = Merging will not be possible when head branch is behind base branch. | ||
settings.block_admin_merge_override = Administrators must follow branch protection rules | ||
settings.block_admin_merge_override_desc = Administrators must follow branch protection rules and can not circumvent it. | ||
settings.block_admin_merge_override_desc = Administrators must follow branch protection rules and cannot circumvent it. | ||
settings.default_branch_desc = Select a default repository branch for pull requests and code commits: | ||
settings.merge_style_desc = Merge Styles | ||
settings.default_merge_style_desc = Default Merge Style | ||
|
@@ -2568,10 +2568,10 @@ settings.matrix.homeserver_url = Homeserver URL | |
settings.matrix.room_id = Room ID | ||
settings.matrix.message_type = Message Type | ||
settings.visibility.private.button = Make Private | ||
settings.visibility.private.text = Changing the visibility to private will not only make the repo visible to only allowed members but may remove the relation between it and forks, watchers, and stars. | ||
settings.visibility.private.text = Changing the visibility to private will make the repo visible only to allowed members and may remove the relationship between it and existing forks, watchers, and stars. | ||
settings.visibility.private.bullet_title = <strong>Changing the visibility to private will:</strong> | ||
settings.visibility.private.bullet_one = Make the repo visible to only allowed members. | ||
settings.visibility.private.bullet_two = May remove the relation between it and <strong>forks</strong>, <strong>watchers</strong>, and <strong>stars</strong>. | ||
settings.visibility.private.bullet_one = Make the repo visible only to allowed members. | ||
settings.visibility.private.bullet_two = May remove the relationship between it and <strong>forks</strong>, <strong>watchers</strong>, and <strong>stars</strong>. | ||
settings.visibility.public.button = Make Public | ||
settings.visibility.public.text = Changing the visibility to public will make the repo visible to anyone. | ||
settings.visibility.public.bullet_title= <strong>Changing the visibility to public will:</strong> | ||
|
@@ -2826,7 +2826,7 @@ team_permission_desc = Permission | |
team_unit_desc = Allow Access to Repository Sections | ||
team_unit_disabled = (Disabled) | ||
|
||
form.name_been_taken = The organisation name "%s" has already been taken. | ||
form.name_been_taken = The organization name "%s" has already been taken. | ||
form.name_reserved = The organization name "%s" is reserved. | ||
form.name_pattern_not_allowed = The pattern "%s" is not allowed in an organization name. | ||
form.create_org_not_allowed = You are not allowed to create an organization. | ||
|
@@ -2868,7 +2868,7 @@ settings.delete_notices_2 = This operation will permanently delete all the <stro | |
settings.delete_notices_3 = This operation will permanently delete all the <strong>packages</strong> of <strong>%s</strong>. | ||
settings.delete_notices_4 = This operation will permanently delete all the <strong>projects</strong> of <strong>%s</strong>. | ||
settings.confirm_delete_account = Confirm Deletion | ||
settings.delete_failed = Delete Organization failed because of internal error | ||
settings.delete_failed = Delete Organization failed due to an internal error | ||
settings.delete_successful = Organization <b>%s</b> has been deleted successfully. | ||
settings.hooks_desc = Add webhooks which will be triggered for <strong>all repositories</strong> under this organization. | ||
|
||
|
@@ -3018,9 +3018,9 @@ dashboard.resync_all_sshprincipals = Update the '.ssh/authorized_principals' fil | |
dashboard.resync_all_hooks = Resynchronize pre-receive, update and post-receive hooks of all repositories. | ||
dashboard.reinit_missing_repos = Reinitialize all missing Git repositories for which records exist | ||
dashboard.sync_external_users = Synchronize external user data | ||
dashboard.cleanup_hook_task_table = Cleanup hook_task table | ||
dashboard.cleanup_packages = Cleanup expired packages | ||
dashboard.cleanup_actions = Cleanup expired actions resources | ||
dashboard.cleanup_hook_task_table = Clean up hook_task table | ||
dashboard.cleanup_packages = Clean up expired packages | ||
dashboard.cleanup_actions = Clean up expired actions' resources | ||
dashboard.server_uptime = Server Uptime | ||
dashboard.current_goroutine = Current Goroutines | ||
dashboard.current_memory_usage = Current Memory Usage | ||
|
@@ -3457,7 +3457,7 @@ monitor.start = Start Time | |
monitor.execute_time = Execution Time | ||
monitor.last_execution_result = Result | ||
monitor.process.cancel = Cancel process | ||
monitor.process.cancel_desc = Cancelling a process may cause data loss | ||
monitor.process.cancel_desc = Canceling a process may cause data loss | ||
monitor.process.children = Children | ||
monitor.queues = Queues | ||
|
@@ -3729,7 +3729,7 @@ owner.settings.cargo.initialize.success = The Cargo index was successfully creat | |
owner.settings.cargo.rebuild = Rebuild Index | ||
owner.settings.cargo.rebuild.description = Rebuilding can be useful if the index is not synchronized with the stored Cargo packages. | ||
owner.settings.cargo.rebuild.error = Failed to rebuild Cargo index: %v | ||
owner.settings.cargo.rebuild.success = The Cargo index was successfully rebuild. | ||
owner.settings.cargo.rebuild.success = The Cargo index was successfully rebuilt. | ||
owner.settings.cleanuprules.title = Manage Cleanup Rules | ||
owner.settings.cleanuprules.add = Add Cleanup Rule | ||
owner.settings.cleanuprules.edit = Edit Cleanup Rule | ||
|
@@ -3817,7 +3817,7 @@ runners.delete_runner = Delete this runner | |
runners.delete_runner_success = Runner deleted successfully | ||
runners.delete_runner_failed = Failed to delete runner | ||
runners.delete_runner_header = Confirm to delete this runner | ||
runners.delete_runner_notice = If a task is running on this runner, it will be terminated and mark as failed. It may break building workflow. | ||
runners.delete_runner_notice = If a task is running on this runner, it will be terminated and marked as failed. It may break building workflow. | ||
runners.none = No runners available | ||
runners.status.unspecified = Unknown | ||
runners.status.idle = Idle | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It depends on what is meant here.
"Algorithm A has this (qualitative) strength and algorithm B has that strength" → strengths
vs.
"Algorithms A and B differ in how strong they are" → strength
Based on the subsequent sentence, I guess it's more the first meaning.