summaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
authorqwerty287 <80460567+qwerty287@users.noreply.github.com>2021-12-24 04:56:57 +0100
committerGitHub <noreply@github.com>2021-12-24 11:56:57 +0800
commit5754080eb9b13e3446443bc7c17cd53d160dfdf2 (patch)
tree1322ff6aba97c24905380def413af01e67d2d4f7 /options
parenta5df7ba6bf57c764b1c5e4c67dbbdf5b115765c9 (diff)
downloadgitea-5754080eb9b13e3446443bc7c17cd53d160dfdf2.tar.gz
gitea-5754080eb9b13e3446443bc7c17cd53d160dfdf2.zip
Fix various typos of software names (#18083)
* `git` -> `Git` * `Github` and `github` -> `GitHub` * `crowdin` -> `Crowdin` * `git-lfs` -> `Git LFS` * `githooks`, `git hooks`, `git-hooks` -> `Git Hooks` * `discord` -> `Discord` * `2fa` -> `2FA` * `gitlab` and `Gitlab` -> `GitLab` * `web hook` -> `webhook` * `linux` -> `Linux` * `sqlite` -> `SQLite` * `MYSQL` and `mysql` -> `MySQL` * rename refs to `master` branch -> `main` * Fix English grammar
Diffstat (limited to 'options')
-rw-r--r--options/locale/locale_en-US.ini18
1 files changed, 9 insertions, 9 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 3b0092a5ef..f1171df08d 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -881,7 +881,7 @@ desc.archived = Archived
template.items = Template Items
template.git_content = Git Content (Default Branch)
template.git_hooks = Git Hooks
-template.git_hooks_tooltip = You are currently unable to modify or remove git hooks once added. Select this only if you trust the template repository.
+template.git_hooks_tooltip = You are currently unable to modify or remove Git Hooks once added. Select this only if you trust the template repository.
template.webhooks = Webhooks
template.topics = Topics
template.avatar = Avatar
@@ -919,7 +919,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 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.
@@ -934,7 +934,7 @@ migrate.migrating = Migrating from <b>%s</b> ...
migrate.migrating_failed = Migrating from <b>%s</b> failed.
migrate.migrating_failed.error = Error: %s
migrate.migrating_failed_no_addr = Migration failed.
-migrate.github.description = Migrate data from github.com or other Github instances.
+migrate.github.description = Migrate data from github.com or other GitHub instances.
migrate.git.description = Migrate a repository only from any Git service.
migrate.gitlab.description = Migrate data from gitlab.com or other GitLab instances.
migrate.gitea.description = Migrate data from gitea.com or other Gitea instances.
@@ -970,7 +970,7 @@ clone_this_repo = Clone this repository
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.
+broken_message = The Git data underlying this repository cannot be read. Contact the administrator of this instance or delete this repository.
code = Code
code.desc = Access source code, files, commits and branches.
@@ -1066,8 +1066,8 @@ editor.commit_empty_file_text = The file you're about to commit is empty. Procee
editor.no_changes_to_show = There are no changes to show.
editor.fail_to_update_file = Failed to update/create file '%s'.
editor.fail_to_update_file_summary = Error Message:
-editor.push_rejected_no_message = The change was rejected by the server without a message. Please check githooks.
-editor.push_rejected = The change was rejected by the server. Please check githooks.
+editor.push_rejected_no_message = The change was rejected by the server without a message. Please check Git Hooks.
+editor.push_rejected = The change was rejected by the server. Please check Git Hooks.
editor.push_rejected_summary = Full Rejection Message:
editor.add_subdir = Add a directory…
editor.unable_to_upload_files = Failed to upload files to '%s' with error: %v
@@ -1507,9 +1507,9 @@ pulls.rebase_conflict_summary = Error Message
pulls.unrelated_histories = Merge Failed: The merge head and base do not share a common history. Hint: Try a different strategy
pulls.merge_out_of_date = Merge Failed: Whilst generating the merge, the base was updated. Hint: Try again.
pulls.head_out_of_date = Merge Failed: Whilst generating the merge, the head was updated. Hint: Try again.
-pulls.push_rejected = Merge Failed: The push was rejected. Review the githooks for this repository.
+pulls.push_rejected = Merge Failed: The push was rejected. Review the Git Hooks for this repository.
pulls.push_rejected_summary = Full Rejection Message
-pulls.push_rejected_no_message = Merge Failed: The push was rejected but there was no remote message.<br>Review the githooks for this repository
+pulls.push_rejected_no_message = Merge Failed: The push was rejected but there was no remote message.<br>Review the Git Hooks for this repository
pulls.open_unmerged_pull_exists = `You cannot perform a reopen operation because there is a pending pull request (#%d) with identical properties.`
pulls.status_checking = Some checks are pending
pulls.status_checks_success = All checks were successful
@@ -1834,7 +1834,7 @@ settings.webhook.response = Response
settings.webhook.headers = Headers
settings.webhook.payload = Content
settings.webhook.body = Body
-settings.githooks_desc = "Git hooks are powered by Git itself. You can edit hook files below to set up custom operations."
+settings.githooks_desc = "Git Hooks are powered by Git itself. You can edit hook files below to set up custom operations."
settings.githook_edit_desc = If the hook is inactive, sample content will be presented. Leaving content to an empty value will disable this hook.
settings.githook_name = Hook Name
settings.githook_content = Hook Content