From d5062d0c271778a8f1835bd719b74bff3fcda937 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Mon, 30 Jun 2025 09:26:15 +0800 Subject: [PATCH] docs: fix typo in pull request merge warning message text (#34899) (#34903) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 https://github.com/go-gitea/gitea/issues/34893 Co-authored-by: Pavanipogula <51442511+Pavanipogula@users.noreply.github.com> --- options/locale/locale_en-US.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index bdf7828966..c026c818c5 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1957,7 +1957,7 @@ pulls.cmd_instruction_checkout_title = Checkout pulls.cmd_instruction_checkout_desc = From your project repository, check out a new branch and test the changes. pulls.cmd_instruction_merge_title = Merge pulls.cmd_instruction_merge_desc = Merge the changes and update on Gitea. -pulls.cmd_instruction_merge_warning = Warning: This operation can not merge pull request because "autodetect manual merge" was not enable +pulls.cmd_instruction_merge_warning = Warning: This operation cannot merge pull request because "autodetect manual merge" is not enabled. pulls.clear_merge_message = Clear merge message 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 …".