From 1b12ca80ec0b42568d9f7d1ec65bd77530753955 Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Sat, 18 May 2024 10:24:39 +0500 Subject: [PATCH] [I18N] Some English decap and other fixes --- options/locale/locale_en-US.ini | 42 ++++++++++++++++----------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 2e4d154b7f..ece0e462dd 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -568,7 +568,7 @@ TreeName = File path Content = Content SSPISeparatorReplacement = Separator -SSPIDefaultLanguage = Default Language +SSPIDefaultLanguage = Default language require_error = ` cannot be empty.` alpha_dash_error = ` should contain only alphanumeric, dash ("-") and underscore ("_") characters.` @@ -780,12 +780,12 @@ theme_desc = This will be your default theme across the site. primary = Primary activated = Activated requires_activation = Requires activation -primary_email = Make Primary -activate_email = Send Activation -activations_pending = Activations Pending +primary_email = Make primary +activate_email = Send activation +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 = 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_success = The email address has been removed. theme_update_success = Your theme was updated. @@ -818,7 +818,7 @@ add_new_key = Add SSH key add_new_gpg_key = Add GPG key key_content_ssh_placeholder = Begins with "ssh-ed25519", "ssh-rsa", "ecdsa-sha2-nistp256", "ecdsa-sha2-nistp384", "ecdsa-sha2-nistp521", "sk-ecdsa-sha2-nistp256@openssh.com", or "sk-ssh-ed25519@openssh.com" key_content_gpg_placeholder = Begins with "-----BEGIN PGP PUBLIC KEY BLOCK-----" -add_new_principal = Add Principal +add_new_principal = Add principal ssh_key_been_used = This SSH key has already been added to the server. ssh_key_name_used = An SSH key with same name already exists on your account. ssh_principal_been_used = This principal has already been added to the server. @@ -877,7 +877,7 @@ token_state_desc = This token has been used in the last 7 days principal_state_desc = This principal has been used in the last 7 days show_openid = Show on profile hide_openid = Hide from profile -ssh_disabled = SSH Disabled +ssh_disabled = SSH is disabled ssh_signonly = SSH is currently disabled so these keys are only used for commit signature verification. ssh_externally_managed = This SSH key is externally managed for this user manage_social = Manage Associated Social Accounts @@ -1323,10 +1323,10 @@ editor.add_tmpl = Add "" editor.add = Add %s editor.update = Update %s editor.delete = Delete %s -editor.patch = Apply Patch +editor.patch = Apply patch editor.patching = Patching: editor.fail_to_apply_patch = Unable to apply patch "%s" -editor.new_patch = New Patch +editor.new_patch = New patch editor.commit_message_desc = Add an optional extended description… editor.signoff_desc = Add a Signed-off-by trailer by the committer at the end of the commit log message. editor.commit_directly_to_this_branch = Commit directly to the %s branch. @@ -1354,10 +1354,10 @@ editor.commit_empty_file_header = Commit an empty file editor.commit_empty_file_text = The file you're about to commit is empty. Proceed? 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.fail_to_update_file_summary = Error message: 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.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 editor.upload_file_is_locked = File "%s" is locked by %s. @@ -1374,8 +1374,8 @@ commits.commits = Commits commits.no_commits = No commits in common. "%s" and "%s" have entirely different histories. commits.nothing_to_compare = These branches are equal. commits.search.tooltip = You can prefix keywords with "author:", "committer:", "after:", or "before:", e.g. "revert author:Alice before:2019-01-13". -commits.search_branch = This Branch -commits.search_all = All Branches +commits.search_branch = This branch +commits.search_all = All branches commits.author = Author commits.message = Message commits.browse_further = Browse further @@ -1880,16 +1880,16 @@ pulls.merge_commit_id = The merge commit ID pulls.require_signed_wont_sign = The branch requires signed commits but this merge will not be signed pulls.invalid_merge_option = You cannot use this merge option for this pull request. -pulls.merge_conflict = Merge Failed: There was a conflict whilst merging. Hint: Try a different strategy -pulls.merge_conflict_summary = Error Message -pulls.rebase_conflict = Merge Failed: There was a conflict whilst rebasing commit: %[1]s. Hint: Try a different strategy -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.merge_conflict = Merge failed: There was a conflict whilst merging. Hint: Try a different strategy +pulls.merge_conflict_summary = Error message +pulls.rebase_conflict = Merge failed: There was a conflict whilst rebasing commit: %[1]s. Hint: Try a different strategy +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.has_merged = Failed: The pull request has been merged, you cannot merge again or change the target branch. pulls.push_rejected = Push Failed: The push was rejected. Review the Git hooks for this repository. -pulls.push_rejected_summary = Full Rejection Message +pulls.push_rejected_summary = Full rejection message pulls.push_rejected_no_message = Push Failed: The push was rejected but there was no remote message. 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