Typos in pr merge command instructions

[morganmastrianni]

Description

I found two small typos in the pr merge command instructions:

1. "can not" should be "cannot"
2. "was not enable" should be "is not enabled."

Screenshots

Gitea Version

1.24.2

Can you reproduce the bug on the Gitea demo site?

Yes

Operating System

No response

Browser Version

NA

[lunny]

Hi @morganmastrianni would you like to send a pull request to fix it?

[morganmastrianni]

@lunny This is my first time ever opening an issue with an open-source project! It feels intimidating right now but maybe I'll try sending a pull request tomorrow :)

[eeyrjmr]

@lunny This is my first time ever opening an issue with an open-source project! It feels intimidating right now but maybe I'll try sending a pull request tomorrow :)

So the steps are quite easy.

1. fork gitea so you have a local copy
2. create a branch, name it something like "fix_pr_instructions"
3. edit the file/s in question
4. commit message
5. click Pull request to request to upstream
6. enjoy internet points.

In this instance its an easy fix

gitea/options/locale/locale_en-US.ini

Line 1972 in 8df59fa

pulls.cmd_instruction_merge_warning = Warning: This operation can not merge pull request because "autodetect manual merge" was not enable

Only change this one file and let the translation process update all the other languages

[Pavanipogula]

Hello, If this issue has not been assigned or is not currently being worked on, I would like to take it up. Please let me know.

[morganmastrianni]

@Pavanipogula I haven't worked on it, you should go for it :)

[Pavanipogula]

Thanks for the update @morganmastrianni. Will raise a PR shortly.