a1012112796andGitHub 9633f336c8 Add warning message in merge instructions when AutodetectManualMerge was not enabled (#31805) ...

not enabled

quick-f-i-x https://github.com/go-gitea/gitea/issues/31433 ? , maybe
need more disscusion about better solutions.

example view:


![image](https://github.com/user-attachments/assets/2af7e1e8-42b9-4473-89c7-12d4a9205d3f)

adtion notes about how to enable `AutodetectManualMerge`


![image](https://github.com/user-attachments/assets/28f84317-367a-40d8-b50d-a19ef7c664d4)

Signed-off-by: a1012112796 <1012112796@qq.com>

2024-08-10 01:09:34 +00:00

..

locale_cs-CZ.ini

[skip ci] Updated translations via Crowdin

2024-08-01 00:31:07 +00:00

locale_de-DE.ini

[skip ci] Updated translations via Crowdin

2024-08-01 00:31:07 +00:00

locale_el-GR.ini

[skip ci] Updated translations via Crowdin

2024-08-01 00:31:07 +00:00

locale_en-US.ini

Add warning message in merge instructions when AutodetectManualMerge was not enabled (#31805)

2024-08-10 01:09:34 +00:00

locale_es-ES.ini

[skip ci] Updated translations via Crowdin

2024-08-01 00:31:07 +00:00

locale_fa-IR.ini

[skip ci] Updated translations via Crowdin

2024-08-01 00:31:07 +00:00

locale_fi-FI.ini

[skip ci] Updated translations via Crowdin

2024-07-17 00:27:54 +00:00

locale_fr-FR.ini

[skip ci] Updated translations via Crowdin

2024-08-01 00:31:07 +00:00

locale_hu-HU.ini

[skip ci] Updated translations via Crowdin

2024-07-17 00:27:54 +00:00

locale_id-ID.ini

[skip ci] Updated translations via Crowdin

2024-07-17 00:27:54 +00:00

locale_is-IS.ini

[skip ci] Updated translations via Crowdin

2024-07-17 00:27:54 +00:00

locale_it-IT.ini

[skip ci] Updated translations via Crowdin

2024-08-01 00:31:07 +00:00

locale_ja-JP.ini

[skip ci] Updated translations via Crowdin

2024-08-01 00:31:07 +00:00

locale_ko-KR.ini

[skip ci] Updated translations via Crowdin

2024-07-17 00:27:54 +00:00

locale_lv-LV.ini

[skip ci] Updated translations via Crowdin

2024-08-01 00:31:07 +00:00

locale_nl-NL.ini

[skip ci] Updated translations via Crowdin

2024-07-17 00:27:54 +00:00

locale_pl-PL.ini

[skip ci] Updated translations via Crowdin

2024-08-01 00:31:07 +00:00

locale_pt-BR.ini

[skip ci] Updated translations via Crowdin

2024-08-01 00:31:07 +00:00

locale_pt-PT.ini

[skip ci] Updated translations via Crowdin

2024-08-04 00:30:13 +00:00

locale_ru-RU.ini

[skip ci] Updated translations via Crowdin

2024-08-01 00:31:07 +00:00

locale_si-LK.ini

[skip ci] Updated translations via Crowdin

2024-08-01 00:31:07 +00:00

locale_sk-SK.ini

[skip ci] Updated translations via Crowdin

2024-07-12 00:27:07 +00:00

locale_sv-SE.ini

[skip ci] Updated translations via Crowdin

2024-07-17 00:27:54 +00:00

locale_tr-TR.ini

[skip ci] Updated translations via Crowdin

2024-08-04 00:30:13 +00:00

locale_uk-UA.ini

[skip ci] Updated translations via Crowdin

2024-08-01 00:31:07 +00:00

locale_zh-CN.ini

[skip ci] Updated translations via Crowdin

2024-08-09 00:27:50 +00:00

locale_zh-HK.ini

[skip ci] Updated translations via Crowdin

2024-07-17 00:27:54 +00:00

locale_zh-TW.ini

[skip ci] Updated translations via Crowdin

2024-08-01 00:31:07 +00:00

TRANSLATORS

Fix missing left and right carets in TRANSLATORS (#21397)

2022-10-10 10:36:37 -04:00