From 8178b4e98b5aedb0b1ef62fc3bdfc4f8f50fe2aa Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Fri, 24 Jan 2025 05:41:59 +0000 Subject: [PATCH] chore: fix typos, decap a few i18n strings (#6666) A few typos, some from spell checker, some from grepping `the the`, `the a `, ` a the`. Some in comments and some in changelogs. Decapped a few remaining annoying strings, and one new from https://codeberg.org/forgejo/forgejo/pulls/6351 which was introduced by copy-pasting on a slightly out-of-date branch, causing Weblate to issue "reused translation" alerts again. Ref #6439. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6666 Reviewed-by: Earl Warren Reviewed-by: Gusted Co-authored-by: 0ko <0ko@noreply.codeberg.org> Co-committed-by: 0ko <0ko@noreply.codeberg.org> --- RELEASE-NOTES.md | 10 +++++----- models/repo/archive_download_count.go | 2 +- modules/charset/charset.go | 2 +- options/locale/locale_en-US.ini | 6 +++--- release-notes-published/10.0.0.md | 4 ++-- services/forms/user_form.go | 2 +- services/mirror/mirror_push.go | 2 +- web_src/css/repo.css | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index a2749563d2..32f7b8c264 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1590,7 +1590,7 @@ this situation, [follow the instructions in the companion blog post](https://for The most prominent ones are described here, others can be found in the list of commits included in the release as described above. - * [Fix links to pull request reviews sent via mail](https://codeberg.org/forgejo/forgejo/commit/88e179d5ef8ee41f71d068195685ff098b38ca31). The pull request link was correct but it did not go the the review and stayed at the beginning of the page + * [Fix links to pull request reviews sent via mail](https://codeberg.org/forgejo/forgejo/commit/88e179d5ef8ee41f71d068195685ff098b38ca31). The pull request link was correct but it did not go the review and stayed at the beginning of the page * [Recognize OGG as an audio format](https://codeberg.org/forgejo/forgejo/commit/622ec5c79f299c32ac2667a1aa7b4bf5d7c2d6cf) * [Consistently show the last time a cron job was run in the admin panel](https://codeberg.org/forgejo/forgejo/commit/5f769ef20) * [Fix NuGet registry v2 & v3 API search endpoints](https://codeberg.org/forgejo/forgejo/commit/471138829b0c24fe8c621dbb866ae8bb45ebc674) @@ -1609,7 +1609,7 @@ this situation, [follow the instructions in the companion blog post](https://for * [Fix pull request check list when there are more than 30](https://codeberg.org/forgejo/forgejo/commit/e226b9646) * [Fix attachment clipboard copy on insecure origin](https://codeberg.org/forgejo/forgejo/commit/12ac84c26) * [Fix the profile README rendering](https://codeberg.org/forgejo/forgejo/commit/84c3b60a4) that [was inconsistent with other markdown files renderings](https://codeberg.org/forgejo/forgejo/issues/833) - * [Fix API leaking the user email when the caller is not authentified](https://codeberg.org/forgejo/forgejo/commit/d89003cc1) + * [Fix API leaking the user email when the caller is not authenticated](https://codeberg.org/forgejo/forgejo/commit/d89003cc1) ## 1.20.2-0 @@ -1667,7 +1667,7 @@ $ git -C forgejo log --oneline --no-merges origin/v1.19/forgejo..origin/v1.20/fo The semantic version was updated to `5.0.0+0-gitea-1.20.1` because it contains breaking changes. - **Breaking:** - [Scoped access tokens](https://codeberg.org/forgejo/forgejo/commit/18de83b2a3fc120922096b7348d6375094ae1532) or (Personal Access Tokens), were refactored and although existing tokens are still valid, they may have a different scope than before. To ensure that no tokens have a larger scope than expected they must be removed and recreated. - - If your `app.ini` has one of the the following `[indexer].ISSUE_INDEXER_QUEUE_TYPE`, `[indexer].ISSUE_INDEXER_QUEUE_BATCH_NUMBER`, `[indexer].`, `[indexer].ISSUE_INDEXER_QUEUE_DIR`, `[indexer].ISSUE_INDEXER_QUEUE_CONN_STR`, `[indexer].UPDATE_BUFFER_LEN`, `[mailer].SEND_BUFFER_LEN`, `[repository].PULL_REQUEST_QUEUE_LENGTH` or `[repository].MIRROR_QUEUE_LENGTH`, Forgejo will abort immediately. Unless you know exactly what you're doing, you must comment them out so the default values are used. + - If your `app.ini` has one of the following `[indexer].ISSUE_INDEXER_QUEUE_TYPE`, `[indexer].ISSUE_INDEXER_QUEUE_BATCH_NUMBER`, `[indexer].`, `[indexer].ISSUE_INDEXER_QUEUE_DIR`, `[indexer].ISSUE_INDEXER_QUEUE_CONN_STR`, `[indexer].UPDATE_BUFFER_LEN`, `[mailer].SEND_BUFFER_LEN`, `[repository].PULL_REQUEST_QUEUE_LENGTH` or `[repository].MIRROR_QUEUE_LENGTH`, Forgejo will abort immediately. Unless you know exactly what you're doing, you must comment them out so the default values are used. - The `-p` option of `environment-to-ini` is [no longer supported](https://codeberg.org/forgejo/forgejo/commit/fa0b5b14c2faa6a5f76bb2e7bc9241a5e4354189) - The ".png" suffix for [user and organizations is now reserved](https://codeberg.org/forgejo/forgejo/commit/2b91841cd3e1213ff3e4ed4209d6a4be89c2fa79) - The section `[git.reflog]` is [now obsolete and its keys have been moved](https://codeberg.org/forgejo/forgejo/commit/2f149c5c9db97f20fbbc65e32d1f3133048b11a2) to the following replacements: @@ -1761,7 +1761,7 @@ $ git -C forgejo log --oneline --no-merges origin/v1.19/forgejo..origin/v1.20/fo - [The repository migration can be canceled](https://codeberg.org/forgejo/forgejo/commit/f6e029e6c7849d4361abf7f1d749b5d528364ac4) - [Add button on the diff header to copy the file name](https://codeberg.org/forgejo/forgejo/commit/c5ede35124c8d5280219c24049bb0ad7da9f02ed) - [Add --quiet option to the dump CLI](https://codeberg.org/forgejo/forgejo/commit/cb1536471bcef4d78a3fe5cbd738b9f60fabbcc2) - - [Support searching for an issue with its number in the the list of issues](https://codeberg.org/forgejo/forgejo/commit/1144b1d129de530b2c07dfdfaf55de383cd82212) + - [Support searching for an issue with its number in the list of issues](https://codeberg.org/forgejo/forgejo/commit/1144b1d129de530b2c07dfdfaf55de383cd82212) - [Improve the list of notifications](https://codeberg.org/forgejo/forgejo/commit/f7ede92f82f7f3ec7bb31a1249f9524e5b728f34) - [When editing a file in the web UI, allow for a preview whenever possible](https://codeberg.org/forgejo/forgejo/commit/ac64c8297444ade63a2a364c4afb7e6c1de5a75f) - [Make release download URLs human readable](https://codeberg.org/forgejo/forgejo/commit/42919ccb7cd32ab67d0878baf2bac6cd007899a8) @@ -1798,7 +1798,7 @@ $ git -C forgejo log --oneline --no-merges origin/v1.19/forgejo..origin/v1.20/fo - [Add API for gitignore templates](https://codeberg.org/forgejo/forgejo/commit/36a5d4c2f3b5670e5e921034cd5d25817534a6d4) - [Add API to upuload a file to an empty repository](https://codeberg.org/forgejo/forgejo/commit/cf465b472166ccf6d3e001e3043e4bf43e16e6b3) - [Allow for --not when listing the commits of a repo](https://codeberg.org/forgejo/forgejo/commit/f766b002938b5c81e343c81fda3c0669fa09809f) - - [Add `files` and `verification` parameters to improve performances when listing the commits of a a repo](https://codeberg.org/forgejo/forgejo/commit/1dd83dbb917d55bd253001646d6743f247a4d98b) + - [Add `files` and `verification` parameters to improve performances when listing the commits of a repo](https://codeberg.org/forgejo/forgejo/commit/1dd83dbb917d55bd253001646d6743f247a4d98b) - [Allow for listing a single commit in a repository](https://codeberg.org/forgejo/forgejo/commit/5930ab5fdf7a970fcca3cd50b44cf1cacb615a54) - [Create a branch directly from commit on the create branch API](https://codeberg.org/forgejo/forgejo/commit/cd9a13ebb47d32f46b38439a524e3b2e0c619490) - [Add API for Label templates](https://codeberg.org/forgejo/forgejo/commit/25dc1556cd70b567a4920beb002a0addfbfd6ef2) diff --git a/models/repo/archive_download_count.go b/models/repo/archive_download_count.go index 31f0399d53..b0735df3ea 100644 --- a/models/repo/archive_download_count.go +++ b/models/repo/archive_download_count.go @@ -24,7 +24,7 @@ func init() { db.RegisterModel(new(RepoArchiveDownloadCount)) } -// CountArchiveDownload adds one download the the given archive +// CountArchiveDownload adds one download the given archive func CountArchiveDownload(ctx context.Context, repoID, releaseID int64, tp git.ArchiveType) error { updateCount, err := db.GetEngine(ctx).Where("repo_id = ?", repoID).And("release_id = ?", releaseID).And("`type` = ?", tp).Incr("count").Update(new(RepoArchiveDownloadCount)) if err != nil { diff --git a/modules/charset/charset.go b/modules/charset/charset.go index 1855446a98..fc42372b4d 100644 --- a/modules/charset/charset.go +++ b/modules/charset/charset.go @@ -134,7 +134,7 @@ func DetectEncoding(content []byte) (string, error) { // First we check if the content represents valid utf8 content excepting a truncated character at the end. // Now we could decode all the runes in turn but this is not necessarily the cheapest thing to do - // instead we walk backwards from the end to trim off a the incomplete character + // instead we walk backwards from the end to trim off the incomplete character toValidate := content end := len(toValidate) - 1 diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index da2fa60e81..2c7dbe69ad 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2796,7 +2796,7 @@ tag.create_tag_from = Create new tag from "%s" tag.create_success = Tag "%s" has been created. -topic.manage_topics = Manage Topics +topic.manage_topics = Manage topics 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. @@ -3068,7 +3068,7 @@ dashboard.sync_tag.started = Tag sync started dashboard.rebuild_issue_indexer = Rebuild issue indexer users.user_manage_panel = Manage user accounts -users.new_account = Create User Account +users.new_account = Create user account users.name = Username users.full_name = Full name users.activated = Activated @@ -3733,7 +3733,7 @@ alt.registry = Setup this registry from the command line: alt.registry.install = To install the package, run the following command: alt.install = Install package alt.setup = Add a repository to the list of connected repositories (choose the necessary architecture instead of '_arch_'): -alt.repository = Repository Info +alt.repository = Repository info alt.repository.architectures = Architectures alt.repository.multiple_groups = This package is available in multiple groups. rubygems.install = To install the package using gem, run the following command: diff --git a/release-notes-published/10.0.0.md b/release-notes-published/10.0.0.md index 850e57a26b..43c0a2d33f 100644 --- a/release-notes-published/10.0.0.md +++ b/release-notes-published/10.0.0.md @@ -430,7 +430,7 @@ - [PR](https://codeberg.org/forgejo/forgejo/pulls/5651): link to security policy in security.txt - [PR](https://codeberg.org/forgejo/forgejo/pulls/5646): chore(release-notes): no need to specify they are draft - [PR](https://codeberg.org/forgejo/forgejo/pulls/5644): conf: Improve delete_old_actions description - - [PR](https://codeberg.org/forgejo/forgejo/pulls/5641): make syncronize tags to database handle annoted tags + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5641): make synchronize tags to database handle annoted tags - [PR](https://codeberg.org/forgejo/forgejo/pulls/5640): Revert "add gap between branch dropdown and PR button" - [PR](https://codeberg.org/forgejo/forgejo/pulls/5638): Better messages for cases of private profiles - [PR](https://codeberg.org/forgejo/forgejo/pulls/5637): feat(ci): allow manual triggering of the test suite @@ -461,7 +461,7 @@ - [PR](https://codeberg.org/forgejo/forgejo/pulls/5537): i18n: Improve translation strings for webhook events - [PR](https://codeberg.org/forgejo/forgejo/pulls/5536): use column flex on mobile to prevent project title from wrapping - [PR](https://codeberg.org/forgejo/forgejo/pulls/5533): i18n: remove unnecessary variable - - [PR](https://codeberg.org/forgejo/forgejo/pulls/5530): Make chroma match case-insenstive + - [PR](https://codeberg.org/forgejo/forgejo/pulls/5530): Make chroma match case-insensitive - [PR](https://codeberg.org/forgejo/forgejo/pulls/5523): i18n: Fine tune language for units - [PR](https://codeberg.org/forgejo/forgejo/pulls/5522): Update dependency @github/text-expander-element to v2.8.0 (forgejo) - [PR](https://codeberg.org/forgejo/forgejo/pulls/5514): i18n: update of translations from Codeberg Translate diff --git a/services/forms/user_form.go b/services/forms/user_form.go index 3ba8724c92..0d06f4b417 100644 --- a/services/forms/user_form.go +++ b/services/forms/user_form.go @@ -290,7 +290,7 @@ func (f *UpdateThemeForm) Validate(req *http.Request, errs binding.Errors) bindi return middleware.Validate(errs, ctx.Data, f, ctx.Locale) } -// IsThemeExists checks if the theme is a theme available in the config. +// IsThemeExists checks if the theme is available in the config. func (f UpdateThemeForm) IsThemeExists() bool { var exists bool diff --git a/services/mirror/mirror_push.go b/services/mirror/mirror_push.go index 3a9644c3a1..4b1d7718b6 100644 --- a/services/mirror/mirror_push.go +++ b/services/mirror/mirror_push.go @@ -172,7 +172,7 @@ func runPushSync(ctx context.Context, m *repo_model.PushMirror) error { // OpenSSH isn't very intuitive when you want to specify a specific keypair. // Therefore, we need to create a temporary file that stores the private key, so that OpenSSH can use it. - // We delete the the temporary file afterwards. + // We delete the temporary file afterwards. privateKeyPath := "" if m.PublicKey != "" { f, err := os.CreateTemp(os.TempDir(), m.RemoteName) diff --git a/web_src/css/repo.css b/web_src/css/repo.css index e960e9103b..b8cd3c08bb 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -2877,7 +2877,7 @@ tbody.commit-list { .commit-status-header { /* reset the default ".ui.attached.header" styles, to use the outer border */ border: none !important; - /* add a bottom border to make sure the there is always a divider between the header and list when the list is scrolling */ + /* add a bottom border to make sure there is always a divider between the header and list when the list is scrolling */ border-bottom: 1px solid var(--color-secondary) !important; /* use negative margin to avoid the newly added border conflict with the list's top border */ margin: 0 0 -1px !important;