From 11a7d8adfbb3d15490dd80cd0bdf2fa124928a20 Mon Sep 17 00:00:00 2001
From: 0ko <0ko@noreply.codeberg.org>
Date: Tue, 30 Apr 2024 08:59:06 +0500
Subject: [PATCH] [I18N] Cumulative English locale improvements

- decap wiki UI
- decap release UI
- fix cap of self visibility toggle button on org member list
- simplify `release.add_tag`
- simplify `admin_indexer_commit_sha` (we got multiple hash types now, but this referes to commit)
- some improvements to admin dashboard
- fnetX suggestions: [[1]](https://codeberg.org/forgejo/forgejo/pulls/3266#issuecomment-1795685), [[2]](https://codeberg.org/forgejo/forgejo/pulls/3266#issuecomment-1795734)
---
 options/locale/locale_en-US.ini | 62 +++++++++++++++------------------
 1 file changed, 28 insertions(+), 34 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 7125d97d9b..e65219b514 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1067,11 +1067,6 @@ 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.
 auto_init = Initialize repository (Adds .gitignore, License and README)
-trust_model_helper = Select trust model for signature verification. Possible options are:
-trust_model_helper_collaborator = Collaborator: Trust signatures by collaborators
-trust_model_helper_committer = Committer: Trust signatures that match committers
-trust_model_helper_collaborator_committer = Collaborator+Committer: Trust signatures by collaborators which match the committer
-trust_model_helper_default = Default: Use the default trust model for this installation
 create_repo = Create repository
 default_branch = Default branch
 default_branch_label = default
@@ -2002,22 +1997,22 @@ wiki = Wiki
 wiki.welcome = Welcome to the Wiki.
 wiki.welcome_desc = The wiki lets you write and share documentation with collaborators.
 wiki.desc = Write and share documentation with collaborators.
-wiki.create_first_page = Create the First Page
+wiki.create_first_page = Create the first page
 wiki.page = Page
 wiki.filter_page = Filter page
 wiki.new_page = Page
 wiki.page_title = Page title
 wiki.page_content = Page content
 wiki.default_commit_message = Write a note about this page update (optional).
-wiki.save_page = Save Page
+wiki.save_page = Save page
 wiki.cancel = Cancel
 wiki.last_commit_info = %s edited this page %s
 wiki.edit_page_button = Edit
-wiki.new_page_button = New Page
-wiki.file_revision = Page Revision
-wiki.wiki_page_revisions = Wiki Page Revisions
+wiki.new_page_button = New page
+wiki.file_revision = Page revision
+wiki.wiki_page_revisions = Page revisions
 wiki.back_to_wiki = Back to wiki page
-wiki.delete_page_button = Delete Page
+wiki.delete_page_button = Delete page
 wiki.delete_page_notice_1 = Deleting the wiki page "%s" cannot be undone. Continue?
 wiki.page_already_exists = A wiki page with the same name already exists.
 wiki.reserved_page = The wiki page name "%s" is reserved.
@@ -2184,12 +2179,12 @@ settings.pulls.default_allow_edits_from_maintainers = Allow edits from maintaine
 settings.releases_desc = Enable repository releases
 settings.packages_desc = Enable repository package registry
 settings.projects_desc = Enable repository projects
-settings.actions_desc = Enable repository actions
+settings.actions_desc = Enable integrated CI/CD pipelines with Forgejo Actions
 settings.admin_settings = Administrator settings
 settings.admin_enable_health_check = Enable repository health checks (git fsck)
 settings.admin_code_indexer = Code indexer
 settings.admin_stats_indexer = Code statistics indexer
-settings.admin_indexer_commit_sha = Last indexed SHA
+settings.admin_indexer_commit_sha = Last indexed commit
 settings.admin_indexer_unindexed = Unindexed
 settings.reindex_button = Add to reindex queue
 settings.reindex_requested=Reindex requested
@@ -2610,7 +2605,7 @@ diff.review.reject = Request changes
 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
+diff.image.side_by_side = Side by side
 diff.image.swipe = Swipe
 diff.image.overlay = Overlay
 diff.has_escaped = This line has hidden Unicode characters
@@ -2621,16 +2616,16 @@ releases.desc = Track project versions and downloads.
 release.releases = Releases
 release.detail = Release details
 release.tags = Tags
-release.new_release = New Release
+release.new_release = New release
 release.draft = Draft
-release.prerelease = Pre-Release
+release.prerelease = Pre-release
 release.stable = Stable
 release.compare = Compare
 release.edit = edit
 release.ahead.commits = <strong>%d</strong> commits
 release.ahead.target = to %s since this release
 tag.ahead.target = to %s since this tag
-release.source_code = Source Code
+release.source_code = Source code
 release.new_subheader = Releases organize project versions.
 release.edit_subheader = Releases organize project versions.
 release.tag_name = Tag name
@@ -2641,15 +2636,15 @@ release.tag_helper_existing = Existing tag.
 release.title = Release title
 release.title_empty = Title cannot be empty.
 release.message = Describe this release
-release.prerelease_desc = Mark as Pre-Release
+release.prerelease_desc = Mark as pre-release
 release.prerelease_helper = Mark this release unsuitable for production use.
 release.cancel = Cancel
-release.publish = Publish Release
-release.save_draft = Save Draft
-release.edit_release = Update Release
-release.delete_release = Delete Release
-release.delete_tag = Delete Tag
-release.deletion = Delete Release
+release.publish = Publish release
+release.save_draft = Save draft
+release.edit_release = Update release
+release.delete_release = Delete release
+release.delete_tag = Delete tag
+release.deletion = Delete release
 release.deletion_desc = Deleting a release only removes it from Forgejo. It will not affect the Git tag, the contents of your repository or its history. Continue?
 release.deletion_success = The release has been deleted.
 release.deletion_tag_desc = Will delete this tag from repository. Repository contents and history remain unchanged. Continue?
@@ -2664,7 +2659,7 @@ release.download_count_few = %s downloads
 release.add_tag_msg = Use the title and content of release as tag message.
 release.hide_archive_links = Hide automatically generated archives
 release.hide_archive_links_helper = Hide automatically generated source code archives for this release. For example, if you are uploading your own.
-release.add_tag = Create Tag Only
+release.add_tag = Create tag
 release.releases_for = Releases for %s
 release.tags_for = Tags for %s
 release.system_generated = This attachment is automatically generated.
@@ -2793,9 +2788,9 @@ settings.labels_desc = Add labels which can be used on issues for <strong>all re
 
 members.membership_visibility = Membership visibility:
 members.public = Visible
-members.public_helper = make hidden
+members.public_helper = Make hidden
 members.private = Hidden
-members.private_helper = make visible
+members.private_helper = Make visible
 members.member_role = Member role:
 members.owner = Owner
 members.member = Member
@@ -2951,8 +2946,8 @@ dashboard.last_gc_time = Time since last GC
 dashboard.total_gc_pause = Total GC pause
 dashboard.last_gc_pause = Last GC pause
 dashboard.gc_times = GC times
-dashboard.delete_old_actions = Delete all old actions from database
-dashboard.delete_old_actions.started = Delete all old actions from database started.
+dashboard.delete_old_actions = Delete all old activities from database
+dashboard.delete_old_actions.started = Delete all old activities from database started.
 dashboard.update_checker = Update checker
 dashboard.delete_old_system_notices = Delete all old system notices from database
 dashboard.gc_lfs = Garbage collect LFS meta objects
@@ -2960,8 +2955,8 @@ dashboard.stop_zombie_tasks = Stop zombie tasks
 dashboard.stop_endless_tasks = Stop endless tasks
 dashboard.cancel_abandoned_jobs = Cancel abandoned jobs
 dashboard.start_schedule_tasks = Start schedule tasks
-dashboard.sync_branch.started = Branches Sync started
-dashboard.sync_tag.started = Tags Sync started
+dashboard.sync_branch.started = Branch sync started
+dashboard.sync_tag.started = Tag sync started
 dashboard.rebuild_issue_indexer = Rebuild issue indexer
 
 users.user_manage_panel = Manage user accounts
@@ -2979,7 +2974,7 @@ users.repos = Repos
 users.created = Created
 users.last_login = Last sign-in
 users.never_login = Never signed in
-users.send_register_notify = Send user registration notification
+users.send_register_notify = Notify about registration via email
 users.new_success = The user account "%s" has been created.
 users.edit = Edit
 users.auth_source = Authentication source
@@ -3663,8 +3658,7 @@ management = Manage secrets
 
 [actions]
 actions = Actions
-
-unit.desc = Manage actions
+unit.desc = Manage integrated CI/CD pipelines with Forgejo Actions
 
 status.unknown = Unknown
 status.waiting = Waiting