Skip to content

Commit 8178b4e

Browse files
0koGusted
authored andcommitted
chore: fix typos, decap a few i18n strings (go-gitea#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 go-gitea#6439. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6666 Reviewed-by: Earl Warren <[email protected]> Reviewed-by: Gusted <[email protected]> Co-authored-by: 0ko <[email protected]> Co-committed-by: 0ko <[email protected]>
1 parent a9c9711 commit 8178b4e

File tree

8 files changed

+15
-15
lines changed

8 files changed

+15
-15
lines changed

RELEASE-NOTES.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1590,7 +1590,7 @@ this situation, [follow the instructions in the companion blog post](https://for
15901590

15911591
The most prominent ones are described here, others can be found in the list of commits included in the release as described above.
15921592

1593-
* [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
1593+
* [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
15941594
* [Recognize OGG as an audio format](https://codeberg.org/forgejo/forgejo/commit/622ec5c79f299c32ac2667a1aa7b4bf5d7c2d6cf)
15951595
* [Consistently show the last time a cron job was run in the admin panel](https://codeberg.org/forgejo/forgejo/commit/5f769ef20)
15961596
* [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
16091609
* [Fix pull request check list when there are more than 30](https://codeberg.org/forgejo/forgejo/commit/e226b9646)
16101610
* [Fix attachment clipboard copy on insecure origin](https://codeberg.org/forgejo/forgejo/commit/12ac84c26)
16111611
* [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)
1612-
* [Fix API leaking the user email when the caller is not authentified](https://codeberg.org/forgejo/forgejo/commit/d89003cc1)
1612+
* [Fix API leaking the user email when the caller is not authenticated](https://codeberg.org/forgejo/forgejo/commit/d89003cc1)
16131613

16141614
## 1.20.2-0
16151615

@@ -1667,7 +1667,7 @@ $ git -C forgejo log --oneline --no-merges origin/v1.19/forgejo..origin/v1.20/fo
16671667
The semantic version was updated to `5.0.0+0-gitea-1.20.1` because it contains breaking changes.
16681668
- **Breaking:**
16691669
- [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.
1670-
- 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.
1670+
- 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.
16711671
- The `-p` option of `environment-to-ini` is [no longer supported](https://codeberg.org/forgejo/forgejo/commit/fa0b5b14c2faa6a5f76bb2e7bc9241a5e4354189)
16721672
- The ".png" suffix for [user and organizations is now reserved](https://codeberg.org/forgejo/forgejo/commit/2b91841cd3e1213ff3e4ed4209d6a4be89c2fa79)
16731673
- 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
17611761
- [The repository migration can be canceled](https://codeberg.org/forgejo/forgejo/commit/f6e029e6c7849d4361abf7f1d749b5d528364ac4)
17621762
- [Add button on the diff header to copy the file name](https://codeberg.org/forgejo/forgejo/commit/c5ede35124c8d5280219c24049bb0ad7da9f02ed)
17631763
- [Add --quiet option to the dump CLI](https://codeberg.org/forgejo/forgejo/commit/cb1536471bcef4d78a3fe5cbd738b9f60fabbcc2)
1764-
- [Support searching for an issue with its number in the the list of issues](https://codeberg.org/forgejo/forgejo/commit/1144b1d129de530b2c07dfdfaf55de383cd82212)
1764+
- [Support searching for an issue with its number in the list of issues](https://codeberg.org/forgejo/forgejo/commit/1144b1d129de530b2c07dfdfaf55de383cd82212)
17651765
- [Improve the list of notifications](https://codeberg.org/forgejo/forgejo/commit/f7ede92f82f7f3ec7bb31a1249f9524e5b728f34)
17661766
- [When editing a file in the web UI, allow for a preview whenever possible](https://codeberg.org/forgejo/forgejo/commit/ac64c8297444ade63a2a364c4afb7e6c1de5a75f)
17671767
- [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
17981798
- [Add API for gitignore templates](https://codeberg.org/forgejo/forgejo/commit/36a5d4c2f3b5670e5e921034cd5d25817534a6d4)
17991799
- [Add API to upuload a file to an empty repository](https://codeberg.org/forgejo/forgejo/commit/cf465b472166ccf6d3e001e3043e4bf43e16e6b3)
18001800
- [Allow for --not when listing the commits of a repo](https://codeberg.org/forgejo/forgejo/commit/f766b002938b5c81e343c81fda3c0669fa09809f)
1801-
- [Add `files` and `verification` parameters to improve performances when listing the commits of a a repo](https://codeberg.org/forgejo/forgejo/commit/1dd83dbb917d55bd253001646d6743f247a4d98b)
1801+
- [Add `files` and `verification` parameters to improve performances when listing the commits of a repo](https://codeberg.org/forgejo/forgejo/commit/1dd83dbb917d55bd253001646d6743f247a4d98b)
18021802
- [Allow for listing a single commit in a repository](https://codeberg.org/forgejo/forgejo/commit/5930ab5fdf7a970fcca3cd50b44cf1cacb615a54)
18031803
- [Create a branch directly from commit on the create branch API](https://codeberg.org/forgejo/forgejo/commit/cd9a13ebb47d32f46b38439a524e3b2e0c619490)
18041804
- [Add API for Label templates](https://codeberg.org/forgejo/forgejo/commit/25dc1556cd70b567a4920beb002a0addfbfd6ef2)

models/repo/archive_download_count.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func init() {
2424
db.RegisterModel(new(RepoArchiveDownloadCount))
2525
}
2626

27-
// CountArchiveDownload adds one download the the given archive
27+
// CountArchiveDownload adds one download the given archive
2828
func CountArchiveDownload(ctx context.Context, repoID, releaseID int64, tp git.ArchiveType) error {
2929
updateCount, err := db.GetEngine(ctx).Where("repo_id = ?", repoID).And("release_id = ?", releaseID).And("`type` = ?", tp).Incr("count").Update(new(RepoArchiveDownloadCount))
3030
if err != nil {

modules/charset/charset.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ func DetectEncoding(content []byte) (string, error) {
134134
// First we check if the content represents valid utf8 content excepting a truncated character at the end.
135135

136136
// Now we could decode all the runes in turn but this is not necessarily the cheapest thing to do
137-
// instead we walk backwards from the end to trim off a the incomplete character
137+
// instead we walk backwards from the end to trim off the incomplete character
138138
toValidate := content
139139
end := len(toValidate) - 1
140140

options/locale/locale_en-US.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2796,7 +2796,7 @@ tag.create_tag_from = Create new tag from "%s"
27962796
27972797
tag.create_success = Tag "%s" has been created.
27982798
2799-
topic.manage_topics = Manage Topics
2799+
topic.manage_topics = Manage topics
28002800
topic.done = Done
28012801
topic.count_prompt = You cannot select more than 25 topics
28022802
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
30683068
dashboard.rebuild_issue_indexer = Rebuild issue indexer
30693069
30703070
users.user_manage_panel = Manage user accounts
3071-
users.new_account = Create User Account
3071+
users.new_account = Create user account
30723072
users.name = Username
30733073
users.full_name = Full name
30743074
users.activated = Activated
@@ -3733,7 +3733,7 @@ alt.registry = Setup this registry from the command line:
37333733
alt.registry.install = To install the package, run the following command:
37343734
alt.install = Install package
37353735
alt.setup = Add a repository to the list of connected repositories (choose the necessary architecture instead of '_arch_'):
3736-
alt.repository = Repository Info
3736+
alt.repository = Repository info
37373737
alt.repository.architectures = Architectures
37383738
alt.repository.multiple_groups = This package is available in multiple groups.
37393739
rubygems.install = To install the package using gem, run the following command:

release-notes-published/10.0.0.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@
430430
- [PR](https://codeberg.org/forgejo/forgejo/pulls/5651): <!--number 5651 --><!--line 0 --><!--description bGluayB0byBzZWN1cml0eSBwb2xpY3kgaW4gc2VjdXJpdHkudHh0-->link to security policy in security.txt<!--description-->
431431
- [PR](https://codeberg.org/forgejo/forgejo/pulls/5646): <!--number 5646 --><!--line 0 --><!--description Y2hvcmUocmVsZWFzZS1ub3Rlcyk6IG5vIG5lZWQgdG8gc3BlY2lmeSB0aGV5IGFyZSBkcmFmdA==-->chore(release-notes): no need to specify they are draft<!--description-->
432432
- [PR](https://codeberg.org/forgejo/forgejo/pulls/5644): <!--number 5644 --><!--line 0 --><!--description Y29uZjogSW1wcm92ZSBkZWxldGVfb2xkX2FjdGlvbnMgZGVzY3JpcHRpb24=-->conf: Improve delete_old_actions description<!--description-->
433-
- [PR](https://codeberg.org/forgejo/forgejo/pulls/5641): <!--number 5641 --><!--line 0 --><!--description bWFrZSBzeW5jcm9uaXplIHRhZ3MgdG8gZGF0YWJhc2UgaGFuZGxlIGFubm90ZWQgdGFncw==-->make syncronize tags to database handle annoted tags<!--description-->
433+
- [PR](https://codeberg.org/forgejo/forgejo/pulls/5641): <!--number 5641 --><!--line 0 --><!--description bWFrZSBzeW5jcm9uaXplIHRhZ3MgdG8gZGF0YWJhc2UgaGFuZGxlIGFubm90ZWQgdGFncw==-->make synchronize tags to database handle annoted tags<!--description-->
434434
- [PR](https://codeberg.org/forgejo/forgejo/pulls/5640): <!--number 5640 --><!--line 0 --><!--description UmV2ZXJ0ICJhZGQgZ2FwIGJldHdlZW4gYnJhbmNoIGRyb3Bkb3duIGFuZCBQUiBidXR0b24i-->Revert "add gap between branch dropdown and PR button"<!--description-->
435435
- [PR](https://codeberg.org/forgejo/forgejo/pulls/5638): <!--number 5638 --><!--line 0 --><!--description QmV0dGVyIG1lc3NhZ2VzIGZvciBjYXNlcyBvZiBwcml2YXRlIHByb2ZpbGVz-->Better messages for cases of private profiles<!--description-->
436436
- [PR](https://codeberg.org/forgejo/forgejo/pulls/5637): <!--number 5637 --><!--line 0 --><!--description ZmVhdChjaSk6IGFsbG93IG1hbnVhbCB0cmlnZ2VyaW5nIG9mIHRoZSB0ZXN0IHN1aXRl-->feat(ci): allow manual triggering of the test suite<!--description-->
@@ -461,7 +461,7 @@
461461
- [PR](https://codeberg.org/forgejo/forgejo/pulls/5537): <!--number 5537 --><!--line 0 --><!--description aTE4bjogSW1wcm92ZSB0cmFuc2xhdGlvbiBzdHJpbmdzIGZvciB3ZWJob29rIGV2ZW50cw==-->i18n: Improve translation strings for webhook events<!--description-->
462462
- [PR](https://codeberg.org/forgejo/forgejo/pulls/5536): <!--number 5536 --><!--line 0 --><!--description dXNlIGNvbHVtbiBmbGV4IG9uIG1vYmlsZSB0byBwcmV2ZW50IHByb2plY3QgdGl0bGUgZnJvbSB3cmFwcGluZw==-->use column flex on mobile to prevent project title from wrapping<!--description-->
463463
- [PR](https://codeberg.org/forgejo/forgejo/pulls/5533): <!--number 5533 --><!--line 0 --><!--description aTE4bjogcmVtb3ZlIHVubmVjZXNzYXJ5IHZhcmlhYmxl-->i18n: remove unnecessary variable<!--description-->
464-
- [PR](https://codeberg.org/forgejo/forgejo/pulls/5530): <!--number 5530 --><!--line 0 --><!--description TWFrZSBjaHJvbWEgbWF0Y2ggY2FzZS1pbnNlbnN0aXZl-->Make chroma match case-insenstive<!--description-->
464+
- [PR](https://codeberg.org/forgejo/forgejo/pulls/5530): <!--number 5530 --><!--line 0 --><!--description TWFrZSBjaHJvbWEgbWF0Y2ggY2FzZS1pbnNlbnN0aXZl-->Make chroma match case-insensitive<!--description-->
465465
- [PR](https://codeberg.org/forgejo/forgejo/pulls/5523): <!--number 5523 --><!--line 0 --><!--description aTE4bjogRmluZSB0dW5lIGxhbmd1YWdlIGZvciB1bml0cw==-->i18n: Fine tune language for units<!--description-->
466466
- [PR](https://codeberg.org/forgejo/forgejo/pulls/5522): <!--number 5522 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgQGdpdGh1Yi90ZXh0LWV4cGFuZGVyLWVsZW1lbnQgdG8gdjIuOC4wIChmb3JnZWpvKQ==-->Update dependency @github/text-expander-element to v2.8.0 (forgejo)<!--description-->
467467
- [PR](https://codeberg.org/forgejo/forgejo/pulls/5514): <!--number 5514 --><!--line 0 --><!--description aTE4bjogdXBkYXRlIG9mIHRyYW5zbGF0aW9ucyBmcm9tIENvZGViZXJnIFRyYW5zbGF0ZQ==-->i18n: update of translations from Codeberg Translate<!--description-->

services/forms/user_form.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ func (f *UpdateThemeForm) Validate(req *http.Request, errs binding.Errors) bindi
290290
return middleware.Validate(errs, ctx.Data, f, ctx.Locale)
291291
}
292292

293-
// IsThemeExists checks if the theme is a theme available in the config.
293+
// IsThemeExists checks if the theme is available in the config.
294294
func (f UpdateThemeForm) IsThemeExists() bool {
295295
var exists bool
296296

services/mirror/mirror_push.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ func runPushSync(ctx context.Context, m *repo_model.PushMirror) error {
172172

173173
// OpenSSH isn't very intuitive when you want to specify a specific keypair.
174174
// Therefore, we need to create a temporary file that stores the private key, so that OpenSSH can use it.
175-
// We delete the the temporary file afterwards.
175+
// We delete the temporary file afterwards.
176176
privateKeyPath := ""
177177
if m.PublicKey != "" {
178178
f, err := os.CreateTemp(os.TempDir(), m.RemoteName)

web_src/css/repo.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2877,7 +2877,7 @@ tbody.commit-list {
28772877
.commit-status-header {
28782878
/* reset the default ".ui.attached.header" styles, to use the outer border */
28792879
border: none !important;
2880-
/* add a bottom border to make sure the there is always a divider between the header and list when the list is scrolling */
2880+
/* add a bottom border to make sure there is always a divider between the header and list when the list is scrolling */
28812881
border-bottom: 1px solid var(--color-secondary) !important;
28822882
/* use negative margin to avoid the newly added border conflict with the list's top border */
28832883
margin: 0 0 -1px !important;

0 commit comments

Comments
 (0)