From 5e7c7e981e6ed2da18c13813f328ec232c8a1d10 Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Fri, 12 Jul 2024 11:58:50 +0000 Subject: [PATCH] Improvements to English locale (#4453) A few fixes and improvements. Notable changes: - `issues.ref_closing_from` now makes sense. https://codeberg.org/attachments/c091cc42-f0bf-4a14-8e43-8c66ead5ef06 - `pulls.cmd_instruction_hint`: removed full stop. https://codeberg.org/attachments/41fcf979-3a5b-48f8-9e60-bde0b06dd522 - `settings.wiki_rename_branch_main_desc`: fix based on change in stalled 3546 so the sentence makes sense. - `find_file.go_to_file`: better describe what the button does https://codeberg.org/attachments/e181e486-3376-446d-a994-bfe65c125a70 - `repos.unadopted.no_more`: it's also shown when there are no results, not when the server "ran out of results" https://codeberg.org/attachments/9077cbc4-f9e7-4ee5-ad86-6cfff41fec37 - `security.txt`: rephrase to decrease brokenness of English. - `translation_meta`: added a special string, can be used to trigger Weblate to create a PR, which is usable for debugging Co-authors: - https://codeberg.org/Cyborus - https://codeberg.org/toolforger - https://codeberg.org/woutput Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4453 Reviewed-by: Earl Warren --- options/locale/locale_en-US.ini | 17 ++++++++++------- public/.well-known/security.txt | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 0c73f0be80..2a19b1c0fe 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1076,7 +1076,7 @@ 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. object_format = Object format -object_format_helper = Object format of the repository. Cannot be changed later. SHA1 is most compatible. +object_format_helper = Object format of the repository. Cannot be changed later. SHA1 is the most compatible. 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. @@ -1615,8 +1615,8 @@ issues.reopened_at = `reopened this issue %[2]s` issues.commit_ref_at = `referenced this issue from a commit %[2]s` issues.ref_issue_from = `referenced this issue %[4]s %[2]s` issues.ref_pull_from = `referenced this pull request %[4]s %[2]s` -issues.ref_closing_from = `referenced a pull request %[4]s that will close this issue %[2]s` -issues.ref_reopening_from = `referenced a pull request %[4]s that will reopen this issue %[2]s` +issues.ref_closing_from = `referenced this issue from a pull request %[4]s that will close it, %[2]s` +issues.ref_reopening_from = `referenced this issue from a pull request %[4]s that will reopen it, %[2]s` issues.ref_closed_from = `closed this issue %[4]s %[2]s` issues.ref_reopened_from = `reopened this issue %[4]s %[2]s` issues.ref_from = `from %[1]s` @@ -1937,7 +1937,7 @@ pulls.close = Close pull request pulls.closed_at = `closed this pull request %[2]s` pulls.reopened_at = `reopened this pull request %[2]s` pulls.commit_ref_at = `referenced this pull request from a commit %[2]s` -pulls.cmd_instruction_hint = `View command line instructions.` +pulls.cmd_instruction_hint = View command line instructions pulls.cmd_instruction_checkout_title = Checkout pulls.cmd_instruction_checkout_desc = From your project repository, check out a new branch and test the changes. pulls.cmd_instruction_merge_title = Merge @@ -2266,7 +2266,7 @@ settings.trust_model.collaboratorcommitter = Collaborator+Committer settings.trust_model.collaboratorcommitter.long = Collaborator+Committer: Trust signatures by collaborators which match the committer settings.trust_model.collaboratorcommitter.desc = Valid signatures by collaborators of this repository will be marked "trusted" if they match the committer. Otherwise, valid signatures will be marked "untrusted" if the signature matches the committer and "unmatched" otherwise. This will force Forgejo to be marked as the committer on signed commits with the actual committer marked as Co-Authored-By: and Co-Committed-By: trailer in the commit. The default Forgejo key must match a User in the database. settings.wiki_rename_branch_main = Normalize the Wiki branch name -settings.wiki_rename_branch_main_desc = Rename the branch used internally by the Wiki to "%s". This is a permanent and cannot be undone. +settings.wiki_rename_branch_main_desc = Rename the branch used internally by the Wiki to "%s". This change is permanent and cannot be undone. settings.wiki_rename_branch_main_notices_1 = This operation CANNOT be undone. settings.wiki_rename_branch_main_notices_2 = This will permanently rename the the internal branch of %s's repository wiki. Existing checkouts will need to be updated. settings.wiki_branch_rename_success = The repository wiki's branch name has been successfully normalized. @@ -2744,7 +2744,7 @@ topic.done = Done topic.count_prompt = You cannot select more than 25 topics topic.format_prompt = Topics must start with a letter or number, can include dashes ("-") and dots ("."), can be up to 35 characters long. Letters must be lowercase. -find_file.go_to_file = Go to file +find_file.go_to_file = Find a file find_file.no_matching = No matching file found error.csv.too_large = Can't render this file because it is too large. @@ -3072,7 +3072,7 @@ orgs.new_orga = New organization repos.repo_manage_panel = Manage repositories repos.unadopted = Unadopted repositories -repos.unadopted.no_more = No more unadopted repositories found +repos.unadopted.no_more = No unadopted repositories found. repos.owner = Owner repos.name = Name repos.private = Private @@ -3816,3 +3816,6 @@ submodule = Submodule filepreview.line = Line %[1]d in %[2]s filepreview.lines = Lines %[1]d to %[2]d in %[3]s filepreview.truncated = Preview has been truncated + +[translation_meta] +test = This is a test string. It is not displayed in Forgejo UI but is used for testing purposes. Feel free to translate it as "ok" to hit the 100% completion :) and save some time diff --git a/public/.well-known/security.txt b/public/.well-known/security.txt index f301a00542..5e7f9b387b 100644 --- a/public/.well-known/security.txt +++ b/public/.well-known/security.txt @@ -1,6 +1,6 @@ # This site is running a Forgejo instance. # Forgejo-related security problems should be reported to the Forgejo security team. -# Site-related security problems should be reported to this site's admin. +# Security problems related to this instance should be reported to its administration. Policy: https://codeberg.org/forgejo/forgejo/src/branch/forgejo/CONTRIBUTING.md Contact: mailto:security@forgejo.org Encryption: https://keys.openpgp.org/vks/v1/by-fingerprint/1B638BDF10969D627926B8D9F585D0F99E1FB56F