From 52d555d4ed58776c108f67229cd7f857242d4e96 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Thu, 19 Oct 2023 22:29:19 +0200 Subject: [PATCH 1/3] fix issues in translation file --- options/locale/locale_en-US.ini | 118 ++++++++++++++++---------------- 1 file changed, 58 insertions(+), 60 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 84c457e9e848b..f4df3771d6361 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -180,7 +180,7 @@ occurred = An error occurred report_message = If you believe that this is a Gitea bug, please search for issues on GitHub or open a new issue if necessary. missing_csrf = Bad Request: no CSRF token present invalid_csrf = Bad Request: invalid CSRF token -not_found = The target couldn't be found. +not_found = "The target couldn't be found." network_error = Network error [startpage] @@ -192,7 +192,7 @@ platform_desc = Gitea runs anywhere code.gitea.io/gitea! Join us by contributing to make this project even better. Don't be shy to be a contributor! +license_desc = "Go get code.gitea.io/gitea! Join us by contributing to make this project even better. Don't be shy to be a contributor!" [install] install = Installation @@ -355,7 +355,6 @@ code_last_indexed_at = Last indexed %s relevant_repositories_tooltip = Repositories that are forks or that have no topic, no icon, and no description are hidden. relevant_repositories = Only relevant repositories are being shown, show unfiltered results. - [auth] create_new_account = Register Account register_helper_msg = Already have an account? Sign in now! @@ -378,7 +377,7 @@ account_activated = Account has been activated prohibit_login = Sign In Prohibited prohibit_login_desc = Your account is prohibited from signing in, please contact your site administrator. resent_limit_prompt = You have already requested an activation email recently. Please wait 3 minutes and try again. -has_unconfirmed_mail = Hi %s, you have an unconfirmed email address (%s). If you haven't received a confirmation email or need to resend a new one, please click on the button below. +has_unconfirmed_mail = "Hi %s, you have an unconfirmed email address (%s). If you haven't received a confirmation email or need to resend a new one, please click on the button below." resend_mail = Click here to resend your activation email email_not_associate = The email address is not associated with any account. send_reset_mail = Send Account Recovery Email @@ -461,15 +460,15 @@ issue.x_mentioned_you = @%s mentioned you: issue.action.force_push = %[1]s force-pushed the %[2]s from %[3]s to %[4]s. issue.action.push_1 = @%[1]s pushed %[3]d commit to %[2]s issue.action.push_n = @%[1]s pushed %[3]d commits to %[2]s -issue.action.close = @%[1]s closed #%[2]d. -issue.action.reopen = @%[1]s reopened #%[2]d. -issue.action.merge = @%[1]s merged #%[2]d into %[3]s. +issue.action.close = "@%[1]s closed #%[2]d." +issue.action.reopen = "@%[1]s reopened #%[2]d." +issue.action.merge = "@%[1]s merged #%[2]d into %[3]s." issue.action.approve = @%[1]s approved this pull request. issue.action.reject = @%[1]s requested changes on this pull request. issue.action.review = @%[1]s commented on this pull request. issue.action.review_dismissed = @%[1]s dismissed last review from %[2]s for this pull request. issue.action.ready_for_review = @%[1]s marked this pull request ready for review. -issue.action.new = @%[1]s created #%[2]d. +issue.action.new = "@%[1]s created #%[2]d." issue.in_tree_path = In %s: release.new.subject = %s in %s released @@ -688,7 +687,7 @@ delete_current_avatar = Delete Current Avatar uploaded_avatar_not_a_image = The uploaded file is not an image. uploaded_avatar_is_too_big = The uploaded file size (%d KiB) exceeds the maximum size (%d KiB). update_avatar_success = Your avatar has been updated. -update_user_avatar_success = The user's avatar has been updated. +update_user_avatar_success = "The user's avatar has been updated." change_password = Update Password old_password = Current Password @@ -739,8 +738,8 @@ add_key = Add Key ssh_desc = These public SSH keys are associated with your account. The corresponding private keys allow full access to your repositories. principal_desc = These SSH certificate principals are associated with your account and allow full access to your repositories. gpg_desc = These public GPG keys are associated with your account. Keep your private keys safe as they allow commits to be verified. -ssh_helper = Need help? Have a look at GitHub's guide to create your own SSH keys or solve common problems you may encounter using SSH. -gpg_helper = Need help? Have a look at GitHub's guide about GPG. +ssh_helper = "Need help? Have a look at GitHub's guide to create your own SSH keys or solve common problems you may encounter using SSH." +gpg_helper = "Need help? Have a look at GitHub's guide about GPG." 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' @@ -926,7 +925,7 @@ visibility.private = Private visibility.private_tooltip = Visible only to members of organizations you have joined [repo] -new_repo_helper = A repository contains all project files, including revision history. Already hosting one elsewhere? Migrate repository. +new_repo_helper = A repository contains all project files, including revision history. Already hosting one elsewhere? Migrate repository. owner = Owner owner_helper = Some organizations may not show up in the dropdown due to a maximum repository count limit. repo_name = Repository Name @@ -944,7 +943,7 @@ visibility_fork_helper = (Changing this will affect all forks.) clone_helper = Need help cloning? Visit Help. fork_repo = Fork Repository fork_from = Fork From -already_forked = You've already forked %s +already_forked = "You've already forked %s" fork_to_different_account = Fork to a different account fork_visibility_helper = The visibility of a forked repository cannot be changed. fork_branch = Branch to be cloned to the fork @@ -961,12 +960,12 @@ repo_desc = Description repo_desc_helper = Enter short description (optional) repo_lang = Language repo_gitignore_helper = Select .gitignore templates. -repo_gitignore_helper_desc = Choose which files not to track from a list of templates for common languages. Typical artifacts generated by each language's build tools are included on .gitignore by default. +repo_gitignore_helper_desc = "Choose which files not to track from a list of templates for common languages. Typical artifacts generated by each language's build tools are included on .gitignore by default." issue_labels = Issue Labels issue_labels_helper = Select an issue label set. license = License license_helper = Select a license file. -license_helper_desc = A license governs what others can and can't do with your code. Not sure which one is right for your project? See Choose a license. +license_helper_desc = "A license governs what others can and can't do with your code. Not sure which one is right for your project? See Choose a license." readme = README readme_helper = Select a README file template. readme_helper_desc = This is the place where you can write a complete description for your project. @@ -1018,14 +1017,14 @@ blame.ignore_revs = Ignoring revisions in .git-blame-ignore-revs.git-blame-ignore-revs. author_search_tooltip = Shows a maximum of 30 users -tree_path_not_found_commit = Path %[1]s doesn't exist in commit %[2]s -tree_path_not_found_branch = Path %[1]s doesn't exist in branch %[2]s -tree_path_not_found_tag = Path %[1]s doesn't exist in tag %[2]s +tree_path_not_found_commit = "Path %[1]s doesn't exist in commit %[2]s" +tree_path_not_found_branch = "Path %[1]s doesn't exist in branch %[2]s" +tree_path_not_found_tag = "Path %[1]s doesn't exist in tag %[2]s" transfer.accept = Accept Transfer -transfer.accept_desc = Transfer to "%s" +transfer.accept_desc = Transfer to "%s" transfer.reject = Reject Transfer -transfer.reject_desc = Cancel transfer to "%s" +transfer.reject_desc = Cancel transfer to "%s" transfer.no_permission_to_accept = You do not have permission to accept this transfer. transfer.no_permission_to_reject = You do not have permission to reject this transfer. @@ -1076,7 +1075,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 cannot import from disallowed hosts, please ask the admin to check ALLOWED_DOMAINS/ALLOW_LOCALNETWORKS/BLOCKED_DOMAINS settings. @@ -1159,7 +1158,7 @@ releases = Releases tag = Tag released_this = released this tagged_this = tagged this -file.title = %s at %s +file.title = %s at %s file_raw = Raw file_history = History file_view_source = View Source @@ -1248,7 +1247,7 @@ editor.file_deleting_no_longer_exists = The file being deleted, "%s", no longer editor.file_changed_while_editing = The file contents have changed since you started editing. Click here to see them or Commit Changes again to overwrite them. editor.file_already_exists = A file named "%s" already exists in this repository. 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.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: @@ -1509,7 +1508,7 @@ issues.role.contributor_helper = This user has previously committed to the repos issues.re_request_review=Re-request review issues.is_stale = There have been changes to this PR since this review issues.remove_request_review=Remove review request -issues.remove_request_review_block=Can't remove review request +issues.remove_request_review_block="Can't remove review request" issues.dismiss_review = Dismiss Review issues.dismiss_review_warning = Are you sure you want to dismiss this review? issues.sign_in_require_desc = Sign in to join this conversation. @@ -1708,7 +1707,7 @@ pulls.review_only_possible_for_full_diff = Review is only possible when viewing 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_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: %[2]s#%[3]d` +pulls.has_pull_request = "A pull request between these branches already exists: %[2]s#%[3]d" pulls.create = Create Pull Request pulls.title_desc = wants to merge %[1]d commits from %[2]s into %[3]s pulls.merged_title_desc = merged %[1]d commits from %[2]s into %[3]s %[4]s @@ -1781,7 +1780,7 @@ pulls.has_merged = Failed: The pull request has been merged, you cannot merge ag 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.
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.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 pulls.status_checks_warning = Some checks reported warnings @@ -1991,8 +1990,8 @@ settings.mirror_settings.docs.disabled_pull_mirror.instructions = Set up your pr settings.mirror_settings.docs.disabled_push_mirror.instructions = Set up your project to automatically pull commits, tags and branches from another repository. settings.mirror_settings.docs.disabled_push_mirror.pull_mirror_warning = Right now, this can only be done in the "New Migration" menu. For more information, please consult: settings.mirror_settings.docs.disabled_push_mirror.info = Push mirrors have been disabled by your site administrator. -settings.mirror_settings.docs.no_new_mirrors = Your repository is mirroring changes to or from another repository. Please keep in mind that you can't create any new mirrors at this time. -settings.mirror_settings.docs.can_still_use = Although you can't modify existing mirrors or create new ones, you may still use your existing mirror. +settings.mirror_settings.docs.no_new_mirrors = "Your repository is mirroring changes to or from another repository. Please keep in mind that you can't create any new mirrors at this time." +settings.mirror_settings.docs.can_still_use = "Although you can't modify existing mirrors or create new ones, you may still use your existing mirror." settings.mirror_settings.docs.pull_mirror_instructions = To set up a pull mirror, please consult: settings.mirror_settings.docs.more_information_if_disabled = You can find out more about push and pull mirrors here: settings.mirror_settings.docs.doc_link_title = How do I mirror repositories? @@ -2134,10 +2133,10 @@ settings.add_team_duplicate = Team already has the repository settings.add_team_success = The team now have access to the repository. settings.search_team = Search Team… settings.change_team_permission_tip = Team's permission is set on the team setting 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.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 -settings.add_webhook.invalid_channel_name = Webhook channel name cannot be empty and cannot contain only a # character. +settings.add_webhook.invalid_channel_name = "Webhook channel name cannot be empty and cannot contain only a # character." settings.hooks_desc = Webhooks automatically make HTTP POST requests to a server when certain Gitea events trigger. Read more in the webhooks guide. settings.webhook_deletion = Remove Webhook settings.webhook_deletion_desc = Removing a webhook deletes its settings and delivery history. Continue? @@ -2446,9 +2445,9 @@ diff.review.header = Submit review diff.review.placeholder = Review comment diff.review.comment = Comment diff.review.approve = Approve -diff.review.self_reject = Pull request authors can't request changes on their own pull request +diff.review.self_reject = "Pull request authors can't request changes on their own pull request" diff.review.reject = Request changes -diff.review.self_approve = Pull request authors can't approve their own pull request +diff.review.self_approve = "Pull request authors can't approve their own pull request" diff.committed_by = committed by diff.protected = Protected diff.image.side_by_side = Side by Side @@ -2507,7 +2506,6 @@ release.releases_for = Releases for %s release.tags_for = Tags for %s branch.name = Branch Name -branch.search = Search branches branch.already_exists = A branch named "%s" already exists. branch.delete_head = Delete branch.delete = Delete Branch "%s" @@ -2558,9 +2556,9 @@ topic.format_prompt = Topics must start with a letter or number, can include das find_file.go_to_file = Go to file find_file.no_matching = No matching file found -error.csv.too_large = Can't render this file because it is too large. -error.csv.unexpected = Can't render this file because it contains an unexpected character in line %d and column %d. -error.csv.invalid_field_count = Can't render this file because it has a wrong number of fields in line %d. +error.csv.too_large = "Can't render this file because it is too large." +error.csv.unexpected = "Can't render this file because it contains an unexpected character in line %d and column %d." +error.csv.invalid_field_count = "Can't render this file because it has a wrong number of fields in line %d." [org] org_name_holder = Organization Name @@ -2606,9 +2604,9 @@ settings.visibility.private_shortname = Private settings.update_settings = Update Settings settings.update_setting_success = Organization settings have been updated. -settings.change_orgname_prompt = Note: Changing the organization name will also change your organization's URL and free the old name. +settings.change_orgname_prompt = "Note: Changing the organization name will also change your organization's URL and free the old name." settings.change_orgname_redirect_prompt = The old name will redirect until it is claimed. -settings.update_avatar_success = The organization's avatar has been updated. +settings.update_avatar_success = "The organization's avatar has been updated." settings.delete = Delete Organization settings.delete_account = Delete This Organization settings.delete_prompt = The organization will be permanently removed. This CANNOT be undone! @@ -2670,7 +2668,7 @@ teams.search_repo_placeholder = Search repository… teams.remove_all_repos_title = Remove all team repositories teams.remove_all_repos_desc = This will remove all repositories from the team. teams.add_all_repos_title = Add all repositories -teams.add_all_repos_desc = This will add all the organization's repositories to the team. +teams.add_all_repos_desc = "This will add all the organization's repositories to the team." teams.add_nonexistent_repo = "The repository you're trying to add doesn't exist, please create it first." teams.add_duplicate_users = User is already a team member. teams.repos.none = No repositories could be accessed by this team. @@ -3174,8 +3172,8 @@ 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_notices = Cancel: %s? +monitor.process.cancel_desc = Cancelling a process may cause data loss +monitor.process.cancel_notices = Cancel: %s? monitor.process.children = Children monitor.queues = Queues @@ -3217,16 +3215,16 @@ notices.delete_success = The system notices have been deleted. create_repo = created repository %s rename_repo = renamed repository from %[1]s to %[3]s commit_repo = pushed to %[3]s at %[4]s -create_issue = `opened issue %[3]s#%[2]s` -close_issue = `closed issue %[3]s#%[2]s` -reopen_issue = `reopened issue %[3]s#%[2]s` -create_pull_request = `created pull request %[3]s#%[2]s` -close_pull_request = `closed pull request %[3]s#%[2]s` -reopen_pull_request = `reopened pull request %[3]s#%[2]s` -comment_issue = `commented on issue %[3]s#%[2]s` -comment_pull = `commented on pull request %[3]s#%[2]s` -merge_pull_request = `merged pull request %[3]s#%[2]s` -auto_merge_pull_request = `automatically merged pull request %[3]s#%[2]s` +create_issue = "opened issue %[3]s#%[2]s" +close_issue = "closed issue %[3]s#%[2]s" +reopen_issue = "reopened issue %[3]s#%[2]s" +create_pull_request = "created pull request %[3]s#%[2]s" +close_pull_request = "closed pull request %[3]s#%[2]s" +reopen_pull_request = "reopened pull request %[3]s#%[2]s" +comment_issue = "commented on issue %[3]s#%[2]s" +comment_pull = "commented on pull request %[3]s#%[2]s" +merge_pull_request = "merged pull request %[3]s#%[2]s" +auto_merge_pull_request = "automatically merged pull request %[3]s#%[2]s" transfer_repo = transferred repository %s to %s push_tag = pushed tag %[3]s to %[4]s delete_tag = deleted tag %[2]s from %[3]s @@ -3237,10 +3235,10 @@ compare_commits_general = Compare commits mirror_sync_push = synced commits to %[3]s at %[4]s from mirror mirror_sync_create = synced new reference %[3]s to %[4]s from mirror mirror_sync_delete = synced and deleted reference %[2]s at %[3]s from mirror -approve_pull_request = `approved %[3]s#%[2]s` -reject_pull_request = `suggested changes for %[3]s#%[2]s` -publish_release = `released "%[4]s" at %[3]s` -review_dismissed = `dismissed review from %[4]s for %[3]s#%[2]s` +approve_pull_request = "approved %[3]s#%[2]s" +reject_pull_request = "suggested changes for %[3]s#%[2]s" +publish_release = `released "%[4]s" at %[3]s` +review_dismissed = "dismissed review from %[4]s for %[3]s#%[2]s" review_dismissed_reason = Reason: create_branch = created branch %[3]s in %[4]s starred_repo = starred %[2]s @@ -3290,7 +3288,7 @@ no_subscriptions = No subscriptions default_key=Signed with default key error.extract_sign = Failed to extract signature error.generate_hash = Failed to generate hash of commit -error.no_committer_account = No account linked to committer's email address +error.no_committer_account = "No account linked to committer's email address" error.no_gpg_keys_found = "No known key found for this signature in database" error.not_signed_commit = "Not a signed commit" error.failed_retrieval_gpg_keys = "Failed to retrieve any key attached to the committer's account" @@ -3307,7 +3305,7 @@ title = Packages desc = Manage repository packages. empty = There are no packages yet. empty.documentation = For more information on the package registry, see the documentation. -empty.repo = Did you upload a package, but it's not shown here? Go to package settings and link it to this repo. +empty.repo = "Did you upload a package, but it's not shown here? Go to package settings and link it to this repo." registry.documentation = For more information on the %s registry, see the documentation. filter.type = Type filter.type.all = All @@ -3412,7 +3410,7 @@ swift.install = Add the package in your Package.swift file: swift.install2 = and run the following command: vagrant.install = To add a Vagrant box, run the following command: settings.link = Link this package to a repository -settings.link.description = If you link a package with a repository, the package is listed in the repository's package list. +settings.link.description = "If you link a package with a repository, the package is listed in the repository's package list." settings.link.select = Select Repository settings.link.button = Update Repository Link settings.link.success = Repository link was successfully updated. @@ -3565,7 +3563,7 @@ type-3.display_name = Organization Project [git.filemode] changed_filemode = %[1]s → %[2]s -# Ordered by git filemode value, ascending. E.g. directory has "040000", normal file has "100644", … +; Ordered by git filemode value, ascending. E.g. directory has "040000", normal file has "100644", … directory = Directory normal_file = Normal file executable_file = Executable file From fc8a3cd513302c86bbda712092f96864599388c2 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Sat, 21 Oct 2023 21:39:29 +0200 Subject: [PATCH 2/3] revert quote changes --- options/locale/locale_en-US.ini | 102 ++++++++++++++++---------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index f4df3771d6361..e363ea2f77dad 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -180,7 +180,7 @@ occurred = An error occurred report_message = If you believe that this is a Gitea bug, please search for issues on GitHub or open a new issue if necessary. missing_csrf = Bad Request: no CSRF token present invalid_csrf = Bad Request: invalid CSRF token -not_found = "The target couldn't be found." +not_found = The target couldn't be found. network_error = Network error [startpage] @@ -192,7 +192,7 @@ platform_desc = Gitea runs anywhere code.gitea.io/gitea! Join us by contributing to make this project even better. Don't be shy to be a contributor!" +license_desc = Go get code.gitea.io/gitea! Join us by contributing to make this project even better. Don't be shy to be a contributor! [install] install = Installation @@ -377,7 +377,7 @@ account_activated = Account has been activated prohibit_login = Sign In Prohibited prohibit_login_desc = Your account is prohibited from signing in, please contact your site administrator. resent_limit_prompt = You have already requested an activation email recently. Please wait 3 minutes and try again. -has_unconfirmed_mail = "Hi %s, you have an unconfirmed email address (%s). If you haven't received a confirmation email or need to resend a new one, please click on the button below." +has_unconfirmed_mail = Hi %s, you have an unconfirmed email address (%s). If you haven't received a confirmation email or need to resend a new one, please click on the button below. resend_mail = Click here to resend your activation email email_not_associate = The email address is not associated with any account. send_reset_mail = Send Account Recovery Email @@ -460,15 +460,15 @@ issue.x_mentioned_you = @%s mentioned you: issue.action.force_push = %[1]s force-pushed the %[2]s from %[3]s to %[4]s. issue.action.push_1 = @%[1]s pushed %[3]d commit to %[2]s issue.action.push_n = @%[1]s pushed %[3]d commits to %[2]s -issue.action.close = "@%[1]s closed #%[2]d." -issue.action.reopen = "@%[1]s reopened #%[2]d." -issue.action.merge = "@%[1]s merged #%[2]d into %[3]s." +issue.action.close = @%[1]s closed #%[2]d. +issue.action.reopen = @%[1]s reopened #%[2]d. +issue.action.merge = @%[1]s merged #%[2]d into %[3]s. issue.action.approve = @%[1]s approved this pull request. issue.action.reject = @%[1]s requested changes on this pull request. issue.action.review = @%[1]s commented on this pull request. issue.action.review_dismissed = @%[1]s dismissed last review from %[2]s for this pull request. issue.action.ready_for_review = @%[1]s marked this pull request ready for review. -issue.action.new = "@%[1]s created #%[2]d." +issue.action.new = @%[1]s created #%[2]d. issue.in_tree_path = In %s: release.new.subject = %s in %s released @@ -687,7 +687,7 @@ delete_current_avatar = Delete Current Avatar uploaded_avatar_not_a_image = The uploaded file is not an image. uploaded_avatar_is_too_big = The uploaded file size (%d KiB) exceeds the maximum size (%d KiB). update_avatar_success = Your avatar has been updated. -update_user_avatar_success = "The user's avatar has been updated." +update_user_avatar_success = The user's avatar has been updated. change_password = Update Password old_password = Current Password @@ -738,8 +738,8 @@ add_key = Add Key ssh_desc = These public SSH keys are associated with your account. The corresponding private keys allow full access to your repositories. principal_desc = These SSH certificate principals are associated with your account and allow full access to your repositories. gpg_desc = These public GPG keys are associated with your account. Keep your private keys safe as they allow commits to be verified. -ssh_helper = "Need help? Have a look at GitHub's guide to create your own SSH keys or solve common problems you may encounter using SSH." -gpg_helper = "Need help? Have a look at GitHub's guide about GPG." +ssh_helper = Need help? Have a look at GitHub's guide to create your own SSH keys or solve common problems you may encounter using SSH. +gpg_helper = Need help? Have a look at GitHub's guide about GPG. 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' @@ -857,7 +857,7 @@ oauth2_client_secret_hint = The secret will not be shown again after you leave o oauth2_application_edit = Edit oauth2_application_create_description = OAuth2 applications gives your third-party application access to user accounts on this instance. oauth2_application_remove_description = Removing an OAuth2 application will prevent it from accessing authorized user accounts on this instance. Continue? -oauth2_application_locked = Gitea pre-registers some OAuth2 applications on startup if enabled in config. To prevent unexpected bahavior, these can neither be edited nor removed. Please refer to the OAuth2 documentation for more information. +oauth2_application_locked = Gitea pre-registers some OAuth2 applications on startup if enabled in config. To prevent unexpected behavior, these can neither be edited nor removed. Please refer to the OAuth2 documentation for more information. authorized_oauth2_applications = Authorized OAuth2 Applications authorized_oauth2_applications_description = You have granted access to your personal Gitea account to these third party applications. Please revoke access for applications you no longer need. @@ -943,7 +943,7 @@ visibility_fork_helper = (Changing this will affect all forks.) clone_helper = Need help cloning? Visit Help. fork_repo = Fork Repository fork_from = Fork From -already_forked = "You've already forked %s" +already_forked = You've already forked %s fork_to_different_account = Fork to a different account fork_visibility_helper = The visibility of a forked repository cannot be changed. fork_branch = Branch to be cloned to the fork @@ -960,12 +960,12 @@ repo_desc = Description repo_desc_helper = Enter short description (optional) repo_lang = Language repo_gitignore_helper = Select .gitignore templates. -repo_gitignore_helper_desc = "Choose which files not to track from a list of templates for common languages. Typical artifacts generated by each language's build tools are included on .gitignore by default." +repo_gitignore_helper_desc = Choose which files not to track from a list of templates for common languages. Typical artifacts generated by each language's build tools are included on .gitignore by default. issue_labels = Issue Labels issue_labels_helper = Select an issue label set. license = License license_helper = Select a license file. -license_helper_desc = "A license governs what others can and can't do with your code. Not sure which one is right for your project? See Choose a license." +license_helper_desc = A license governs what others can and can't do with your code. Not sure which one is right for your project? See Choose a license. readme = README readme_helper = Select a README file template. readme_helper_desc = This is the place where you can write a complete description for your project. @@ -1017,9 +1017,9 @@ blame.ignore_revs = Ignoring revisions in .git-blame-ignore-revs.git-blame-ignore-revs. author_search_tooltip = Shows a maximum of 30 users -tree_path_not_found_commit = "Path %[1]s doesn't exist in commit %[2]s" -tree_path_not_found_branch = "Path %[1]s doesn't exist in branch %[2]s" -tree_path_not_found_tag = "Path %[1]s doesn't exist in tag %[2]s" +tree_path_not_found_commit = Path %[1]s doesn't exist in commit %[2]s +tree_path_not_found_branch = Path %[1]s doesn't exist in branch %[2]s +tree_path_not_found_tag = Path %[1]s doesn't exist in tag %[2]s transfer.accept = Accept Transfer transfer.accept_desc = Transfer to "%s" @@ -1075,7 +1075,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 cannot import from disallowed hosts, please ask the admin to check ALLOWED_DOMAINS/ALLOW_LOCALNETWORKS/BLOCKED_DOMAINS settings. @@ -1247,7 +1247,7 @@ editor.file_deleting_no_longer_exists = The file being deleted, "%s", no longer editor.file_changed_while_editing = The file contents have changed since you started editing. Click here to see them or Commit Changes again to overwrite them. editor.file_already_exists = A file named "%s" already exists in this repository. 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.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: @@ -1508,7 +1508,7 @@ issues.role.contributor_helper = This user has previously committed to the repos issues.re_request_review=Re-request review issues.is_stale = There have been changes to this PR since this review issues.remove_request_review=Remove review request -issues.remove_request_review_block="Can't remove review request" +issues.remove_request_review_block=Can't remove review request issues.dismiss_review = Dismiss Review issues.dismiss_review_warning = Are you sure you want to dismiss this review? issues.sign_in_require_desc = Sign in to join this conversation. @@ -1707,7 +1707,7 @@ pulls.review_only_possible_for_full_diff = Review is only possible when viewing 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_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: %[2]s#%[3]d" +pulls.has_pull_request = A pull request between these branches already exists: %[2]s#%[3]d pulls.create = Create Pull Request pulls.title_desc = wants to merge %[1]d commits from %[2]s into %[3]s pulls.merged_title_desc = merged %[1]d commits from %[2]s into %[3]s %[4]s @@ -1780,7 +1780,7 @@ pulls.has_merged = Failed: The pull request has been merged, you cannot merge ag 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.
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.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 pulls.status_checks_warning = Some checks reported warnings @@ -1990,8 +1990,8 @@ settings.mirror_settings.docs.disabled_pull_mirror.instructions = Set up your pr settings.mirror_settings.docs.disabled_push_mirror.instructions = Set up your project to automatically pull commits, tags and branches from another repository. settings.mirror_settings.docs.disabled_push_mirror.pull_mirror_warning = Right now, this can only be done in the "New Migration" menu. For more information, please consult: settings.mirror_settings.docs.disabled_push_mirror.info = Push mirrors have been disabled by your site administrator. -settings.mirror_settings.docs.no_new_mirrors = "Your repository is mirroring changes to or from another repository. Please keep in mind that you can't create any new mirrors at this time." -settings.mirror_settings.docs.can_still_use = "Although you can't modify existing mirrors or create new ones, you may still use your existing mirror." +settings.mirror_settings.docs.no_new_mirrors = Your repository is mirroring changes to or from another repository. Please keep in mind that you can't create any new mirrors at this time. +settings.mirror_settings.docs.can_still_use = Although you can't modify existing mirrors or create new ones, you may still use your existing mirror. settings.mirror_settings.docs.pull_mirror_instructions = To set up a pull mirror, please consult: settings.mirror_settings.docs.more_information_if_disabled = You can find out more about push and pull mirrors here: settings.mirror_settings.docs.doc_link_title = How do I mirror repositories? @@ -2133,10 +2133,10 @@ settings.add_team_duplicate = Team already has the repository settings.add_team_success = The team now have access to the repository. settings.search_team = Search Team… settings.change_team_permission_tip = Team's permission is set on the team setting 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.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 -settings.add_webhook.invalid_channel_name = "Webhook channel name cannot be empty and cannot contain only a # character." +settings.add_webhook.invalid_channel_name = Webhook channel name cannot be empty and cannot contain only a # character. settings.hooks_desc = Webhooks automatically make HTTP POST requests to a server when certain Gitea events trigger. Read more in the webhooks guide. settings.webhook_deletion = Remove Webhook settings.webhook_deletion_desc = Removing a webhook deletes its settings and delivery history. Continue? @@ -2445,9 +2445,9 @@ diff.review.header = Submit review diff.review.placeholder = Review comment diff.review.comment = Comment diff.review.approve = Approve -diff.review.self_reject = "Pull request authors can't request changes on their own pull request" +diff.review.self_reject = Pull request authors can't request changes on their own pull request diff.review.reject = Request changes -diff.review.self_approve = "Pull request authors can't approve their own pull request" +diff.review.self_approve = Pull request authors can't approve their own pull request diff.committed_by = committed by diff.protected = Protected diff.image.side_by_side = Side by Side @@ -2556,9 +2556,9 @@ topic.format_prompt = Topics must start with a letter or number, can include das find_file.go_to_file = Go to file find_file.no_matching = No matching file found -error.csv.too_large = "Can't render this file because it is too large." -error.csv.unexpected = "Can't render this file because it contains an unexpected character in line %d and column %d." -error.csv.invalid_field_count = "Can't render this file because it has a wrong number of fields in line %d." +error.csv.too_large = Can't render this file because it is too large. +error.csv.unexpected = Can't render this file because it contains an unexpected character in line %d and column %d. +error.csv.invalid_field_count = Can't render this file because it has a wrong number of fields in line %d. [org] org_name_holder = Organization Name @@ -2604,9 +2604,9 @@ settings.visibility.private_shortname = Private settings.update_settings = Update Settings settings.update_setting_success = Organization settings have been updated. -settings.change_orgname_prompt = "Note: Changing the organization name will also change your organization's URL and free the old name." +settings.change_orgname_prompt = Note: Changing the organization name will also change your organization's URL and free the old name. settings.change_orgname_redirect_prompt = The old name will redirect until it is claimed. -settings.update_avatar_success = "The organization's avatar has been updated." +settings.update_avatar_success = The organization's avatar has been updated. settings.delete = Delete Organization settings.delete_account = Delete This Organization settings.delete_prompt = The organization will be permanently removed. This CANNOT be undone! @@ -2668,7 +2668,7 @@ teams.search_repo_placeholder = Search repository… teams.remove_all_repos_title = Remove all team repositories teams.remove_all_repos_desc = This will remove all repositories from the team. teams.add_all_repos_title = Add all repositories -teams.add_all_repos_desc = "This will add all the organization's repositories to the team." +teams.add_all_repos_desc = This will add all the organization's repositories to the team. teams.add_nonexistent_repo = "The repository you're trying to add doesn't exist, please create it first." teams.add_duplicate_users = User is already a team member. teams.repos.none = No repositories could be accessed by this team. @@ -3215,16 +3215,16 @@ notices.delete_success = The system notices have been deleted. create_repo = created repository %s rename_repo = renamed repository from %[1]s to %[3]s commit_repo = pushed to %[3]s at %[4]s -create_issue = "opened issue %[3]s#%[2]s" -close_issue = "closed issue %[3]s#%[2]s" -reopen_issue = "reopened issue %[3]s#%[2]s" -create_pull_request = "created pull request %[3]s#%[2]s" -close_pull_request = "closed pull request %[3]s#%[2]s" -reopen_pull_request = "reopened pull request %[3]s#%[2]s" -comment_issue = "commented on issue %[3]s#%[2]s" -comment_pull = "commented on pull request %[3]s#%[2]s" -merge_pull_request = "merged pull request %[3]s#%[2]s" -auto_merge_pull_request = "automatically merged pull request %[3]s#%[2]s" +create_issue = opened issue %[3]s#%[2]s +close_issue = closed issue %[3]s#%[2]s +reopen_issue = reopened issue %[3]s#%[2]s +create_pull_request = created pull request %[3]s#%[2]s +close_pull_request = closed pull request %[3]s#%[2]s +reopen_pull_request = reopened pull request %[3]s#%[2]s +comment_issue = commented on issue %[3]s#%[2]s +comment_pull = commented on pull request %[3]s#%[2]s +merge_pull_request = merged pull request %[3]s#%[2]s +auto_merge_pull_request = automatically merged pull request %[3]s#%[2]s transfer_repo = transferred repository %s to %s push_tag = pushed tag %[3]s to %[4]s delete_tag = deleted tag %[2]s from %[3]s @@ -3235,10 +3235,10 @@ compare_commits_general = Compare commits mirror_sync_push = synced commits to %[3]s at %[4]s from mirror mirror_sync_create = synced new reference %[3]s to %[4]s from mirror mirror_sync_delete = synced and deleted reference %[2]s at %[3]s from mirror -approve_pull_request = "approved %[3]s#%[2]s" -reject_pull_request = "suggested changes for %[3]s#%[2]s" +approve_pull_request = approved %[3]s#%[2]s +reject_pull_request = suggested changes for %[3]s#%[2]s publish_release = `released "%[4]s" at %[3]s` -review_dismissed = "dismissed review from %[4]s for %[3]s#%[2]s" +review_dismissed = dismissed review from %[4]s for %[3]s#%[2]s review_dismissed_reason = Reason: create_branch = created branch %[3]s in %[4]s starred_repo = starred %[2]s @@ -3288,7 +3288,7 @@ no_subscriptions = No subscriptions default_key=Signed with default key error.extract_sign = Failed to extract signature error.generate_hash = Failed to generate hash of commit -error.no_committer_account = "No account linked to committer's email address" +error.no_committer_account = No account linked to committer's email address error.no_gpg_keys_found = "No known key found for this signature in database" error.not_signed_commit = "Not a signed commit" error.failed_retrieval_gpg_keys = "Failed to retrieve any key attached to the committer's account" @@ -3305,7 +3305,7 @@ title = Packages desc = Manage repository packages. empty = There are no packages yet. empty.documentation = For more information on the package registry, see the documentation. -empty.repo = "Did you upload a package, but it's not shown here? Go to package settings and link it to this repo." +empty.repo = Did you upload a package, but it's not shown here? Go to package settings and link it to this repo. registry.documentation = For more information on the %s registry, see the documentation. filter.type = Type filter.type.all = All @@ -3410,7 +3410,7 @@ swift.install = Add the package in your Package.swift file: swift.install2 = and run the following command: vagrant.install = To add a Vagrant box, run the following command: settings.link = Link this package to a repository -settings.link.description = "If you link a package with a repository, the package is listed in the repository's package list." +settings.link.description = If you link a package with a repository, the package is listed in the repository's package list. settings.link.select = Select Repository settings.link.button = Update Repository Link settings.link.success = Repository link was successfully updated. From 8f94a5c87837e5adc9567e957e848ef3d8d800c4 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Sat, 21 Oct 2023 21:43:37 +0200 Subject: [PATCH 3/3] revert more changes --- options/locale/locale_en-US.ini | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index e363ea2f77dad..d34d10566e04a 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1707,7 +1707,7 @@ pulls.review_only_possible_for_full_diff = Review is only possible when viewing 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_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: %[2]s#%[3]d +pulls.has_pull_request = `A pull request between these branches already exists: %[2]s#%[3]d` pulls.create = Create Pull Request pulls.title_desc = wants to merge %[1]d commits from %[2]s into %[3]s pulls.merged_title_desc = merged %[1]d commits from %[2]s into %[3]s %[4]s @@ -1780,7 +1780,7 @@ pulls.has_merged = Failed: The pull request has been merged, you cannot merge ag 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.
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.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 pulls.status_checks_warning = Some checks reported warnings @@ -3215,16 +3215,16 @@ notices.delete_success = The system notices have been deleted. create_repo = created repository %s rename_repo = renamed repository from %[1]s to %[3]s commit_repo = pushed to %[3]s at %[4]s -create_issue = opened issue %[3]s#%[2]s -close_issue = closed issue %[3]s#%[2]s -reopen_issue = reopened issue %[3]s#%[2]s -create_pull_request = created pull request %[3]s#%[2]s -close_pull_request = closed pull request %[3]s#%[2]s -reopen_pull_request = reopened pull request %[3]s#%[2]s -comment_issue = commented on issue %[3]s#%[2]s -comment_pull = commented on pull request %[3]s#%[2]s -merge_pull_request = merged pull request %[3]s#%[2]s -auto_merge_pull_request = automatically merged pull request %[3]s#%[2]s +create_issue = `opened issue %[3]s#%[2]s` +close_issue = `closed issue %[3]s#%[2]s` +reopen_issue = `reopened issue %[3]s#%[2]s` +create_pull_request = `created pull request %[3]s#%[2]s` +close_pull_request = `closed pull request %[3]s#%[2]s` +reopen_pull_request = `reopened pull request %[3]s#%[2]s` +comment_issue = `commented on issue %[3]s#%[2]s` +comment_pull = `commented on pull request %[3]s#%[2]s` +merge_pull_request = `merged pull request %[3]s#%[2]s` +auto_merge_pull_request = `automatically merged pull request %[3]s#%[2]s` transfer_repo = transferred repository %s to %s push_tag = pushed tag %[3]s to %[4]s delete_tag = deleted tag %[2]s from %[3]s @@ -3235,10 +3235,10 @@ compare_commits_general = Compare commits mirror_sync_push = synced commits to %[3]s at %[4]s from mirror mirror_sync_create = synced new reference %[3]s to %[4]s from mirror mirror_sync_delete = synced and deleted reference %[2]s at %[3]s from mirror -approve_pull_request = approved %[3]s#%[2]s -reject_pull_request = suggested changes for %[3]s#%[2]s +approve_pull_request = `approved %[3]s#%[2]s` +reject_pull_request = `suggested changes for %[3]s#%[2]s` publish_release = `released "%[4]s" at %[3]s` -review_dismissed = dismissed review from %[4]s for %[3]s#%[2]s +review_dismissed = `dismissed review from %[4]s for %[3]s#%[2]s` review_dismissed_reason = Reason: create_branch = created branch %[3]s in %[4]s starred_repo = starred %[2]s