Skip to content

docs: fix typo in pull request merge warning message text #34899

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 30, 2025

Conversation

Pavanipogula
Copy link
Contributor

Description

This PR fixes two typos in the pull request merge command warning message.

  • "can not" → "cannot"
  • "was not enable" → "is not enabled."

File Updated

  • options/locale/locale_en-US.ini (line 1972)

Related Discussion

#34893

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 29, 2025
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jun 29, 2025
@lunny lunny added the backport/v1.24 This PR should be backported to Gitea 1.24 label Jun 29, 2025
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jun 29, 2025
@delvh delvh added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jun 29, 2025
@lunny lunny merged commit c077b71 into go-gitea:main Jun 30, 2025
26 checks passed
@GiteaBot GiteaBot added this to the 1.25.0 milestone Jun 30, 2025
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Jun 30, 2025
…4899)

### Description

This PR fixes two typos in the pull request merge command warning
message.

- "can not" → "cannot"
- "was not enable" → "is not enabled."

### File Updated
- `options/locale/locale_en-US.ini` (line 1972)

### Related Discussion
go-gitea#34893
@GiteaBot GiteaBot added backport/done All backports for this PR have been created and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Jun 30, 2025
lunny pushed a commit that referenced this pull request Jun 30, 2025
…34903)

Backport #34899 by @Pavanipogula

### Description

This PR fixes two typos in the pull request merge command warning
message.

- "can not" → "cannot"
- "was not enable" → "is not enabled."

### File Updated
- `options/locale/locale_en-US.ini` (line 1972)

### Related Discussion
#34893

Co-authored-by: Pavanipogula <51442511+Pavanipogula@users.noreply.github.com>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jun 30, 2025
* giteaofficial/main:
  Add a `login`/`login-name`/`username` disambiguation to affected endpoint parameters and response/request models (go-gitea#34901)
  Improve tags list page (go-gitea#34898)
  [skip ci] Updated translations via Crowdin
  docs: fix typo in pull request merge warning message text (go-gitea#34899)
  Refactor container package (go-gitea#34877)
  [skip ci] Updated translations via Crowdin
  Fix project column edit (go-gitea#34890)
  Upgrade htmx to 2.0.6 (go-gitea#34887)
  Optimize flex layout of release attachment area (go-gitea#34885)
  Improve `labels-list` rendering (go-gitea#34846)
  enforce explanation for necessary nolints and fix bugs (go-gitea#34883)
  Fix a regression when refactoring fork list (go-gitea#34879)
  enforce nolint scope (go-gitea#34851)
bdruth added a commit to bdruth/gitea that referenced this pull request Jul 4, 2025
…h/gitea into feature/enhanced-workflow-runs-api

* 'feature/enhanced-workflow-runs-api' of github.com:bdruth/gitea:
  [skip ci] Updated translations via Crowdin
  Follow file symlinks in the UI to their target (go-gitea#28835)
  Fix issue filter (go-gitea#34914)
  Fix: RPM package download routing & missing package version count (go-gitea#34909)
  Add support for 3D/CAD file formats preview (go-gitea#34794)
  Add a `login`/`login-name`/`username` disambiguation to affected endpoint parameters and response/request models (go-gitea#34901)
  Improve tags list page (go-gitea#34898)
  [skip ci] Updated translations via Crowdin
  docs: fix typo in pull request merge warning message text (go-gitea#34899)
  Refactor container package (go-gitea#34877)
  [skip ci] Updated translations via Crowdin
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/done All backports for this PR have been created backport/v1.24 This PR should be backported to Gitea 1.24 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/translation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants