Fix typos and grammar in English locale#36751
Merged
silverwind merged 3 commits intogo-gitea:mainfrom Feb 27, 2026
Merged
Conversation
GiteaBot
added
the
lgtm/need 2
lunny
approved these changes
Feb 25, 2026
GiteaBot
added
lgtm/need 1
a1012112796
approved these changes
Feb 27, 2026
GiteaBot
added
lgtm/done
Member
|
Some merge conflicts. |
- Rename "enterred" to "entered" in locale keys and Go source files - Fix subject-verb agreement: "enables" -> "enable", "gives" -> "give" - Improve awkward phrasing: "Don't be shy to be a contributor" -> "Don't hesitate to contribute" Ref go-gitea#35015 Signed-off-by: yshyuk <dbsrbtkd94@gmail.com>
yshyuk
force-pushed
the
fix/locale-en-us-typos
branch
from
bf61379 to
b23f5d4
Compare
Contributor
Author
|
@silverwind The conflicts were caused by #36769 (Deprecate RenderWithErr) which renamed RenderWithErr → RenderWithErrDeprecated on the same lines where this PR fixes the enterred → entered Affected files:
|
wxiaoguang
reviewed
Feb 27, 2026
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
silverwind
approved these changes
Feb 27, 2026
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Mar 2, 2026
* giteaofficial/main: (21 commits) Enable docker layer caching for `dry-run` and `nightly` container builds (go-gitea#36738) Add admin badge to navbar avatar (go-gitea#36790) WorkflowDispatch api optionally return runid (go-gitea#36706) upgrade minimatch (go-gitea#36760) Add `never` option to `PUBLIC_URL_DETECTION` configuration (go-gitea#36785) Refactor avatar package, support default avatar fallback (go-gitea#36788) Mark unused&immature activitypub as "not implemented" (go-gitea#36789) Add “Copy Source” to markup comment menu (go-gitea#36726) Update Nix flake (go-gitea#36787) Implements OIDC RP-Initiated Logout (go-gitea#36724) Fix README symlink resolution in subdirectories like .github (go-gitea#36775) [skip ci] Updated translations via Crowdin Correct spelling (go-gitea#36783) refactor: replace legacy tw-flex utility classes with flex-text-block/inline (go-gitea#36778) Fix `no-content` message not rendering after comment edit (go-gitea#36733) Fix typos and grammar in English locale (go-gitea#36751) Move Fomantic dropdown CSS to custom module (go-gitea#36530) Use "Enable Gravatar" but not "Disable" (go-gitea#36771) feat: add branch_count to repository API (go-gitea#35351) (go-gitea#36743) Deprecate RenderWithErr (go-gitea#36769) ...
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix several English locale issues as suggested in #35015:
enterredtoenteredin locale keys (form.enterred_invalid_*)and update all Go source references accordingly
oauth2_applications_descandoauth2_application_create_descriptionstartpage.license_descOnly
locale_en-US.jsonis modified; other locales are managed by Crowdin.Ref #35015