Skip to content

Commit 8ba95f9

Browse files
PavanipogulaGiteaBot
authored andcommitted
docs: fix typo in pull request merge warning message text (go-gitea#34899)
### 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
1 parent 90e9e79 commit 8ba95f9

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

options/locale/locale_en-US.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1957,7 +1957,7 @@ pulls.cmd_instruction_checkout_title = Checkout
19571957
pulls.cmd_instruction_checkout_desc = From your project repository, check out a new branch and test the changes.
19581958
pulls.cmd_instruction_merge_title = Merge
19591959
pulls.cmd_instruction_merge_desc = Merge the changes and update on Gitea.
1960-
pulls.cmd_instruction_merge_warning = Warning: This operation can not merge pull request because "autodetect manual merge" was not enable
1960+
pulls.cmd_instruction_merge_warning = Warning: This operation cannot merge pull request because "autodetect manual merge" is not enabled.
19611961
pulls.clear_merge_message = Clear merge message
19621962
pulls.clear_merge_message_hint = Clearing the merge message will only remove the commit message content and keep generated git trailers such as "Co-Authored-By …".
19631963

0 commit comments

Comments
 (0)