forks/forgejo
1
0
Fork 0
Code Releases Activity
forgejo/options/locale
History
a1012112796 e5f8d144f2
[PORT] Add warning message in merge instructions when AutodetectManualMerge was not enabled (gitea#31805) 
---

Conflict resolution: trivial
Things done differently: Improve localization message, use the paragraph
element instead of the div element, fix passing this variable to the
template and add a integration test

(cherry picked from commit 9633f336c87947dc7d2a5e76077a10699ba5e50d)
2024-08-11 19:15:37 +02:00
..
locale_ar.ini i18n: update of translations from Weblate (#4330) 2024-07-11 06:33:51 +00:00
locale_be.ini [I18N] Translations update from Weblate (#2521) 2024-03-04 01:58:49 +00:00
locale_bg.ini i18n: update of translations from Weblate (#4451) 2024-07-18 05:14:01 +00:00
locale_bn.ini [I18N] Translations update from Weblate (#2350) 2024-02-17 22:18:04 +00:00
locale_bs.ini s/return_to_gitea/return_to_forgejo (#3822) 2024-05-20 18:44:33 +00:00
locale_ca.ini i18n: update of translations from Weblate (#4783) 2024-08-08 07:16:13 +00:00
locale_cs-CZ.ini i18n: update of translations from Weblate (#4783) 2024-08-08 07:16:13 +00:00
locale_de-DE.ini i18n: update of translations from Weblate (#4783) 2024-08-08 07:16:13 +00:00
locale_el-GR.ini i18n: update of translations from Weblate (#4451) 2024-07-18 05:14:01 +00:00
locale_en-US.ini [PORT] Add warning message in merge instructions when AutodetectManualMerge was not enabled (gitea#31805) 2024-08-11 19:15:37 +02:00
locale_eo.ini i18n: update of translations from Weblate (#4783) 2024-08-08 07:16:13 +00:00
locale_es-ES.ini [I18N] Translations update from Weblate (#4668) 2024-08-01 06:57:25 +00:00
locale_fa-IR.ini Refactor install page hints (#3961) 2024-06-02 13:06:56 +00:00
locale_fi-FI.ini i18n: update of translations from Weblate (#4451) 2024-07-18 05:14:01 +00:00
locale_fil.ini i18n: update of translations from Weblate (#4783) 2024-08-08 07:16:13 +00:00
locale_fr-FR.ini i18n: update of translations from Weblate (#4783) 2024-08-08 07:16:13 +00:00
locale_gl.ini i18n: update of translations from Weblate (#4451) 2024-07-18 05:14:01 +00:00
locale_hi.ini [I18N] Translations update from Weblate (#3508) 2024-05-04 18:36:49 +00:00
locale_hu-HU.ini [I18N] Translations update from Weblate (#4568) 2024-07-24 08:41:30 +00:00
locale_id-ID.ini i18n: update of translations from Weblate (#4451) 2024-07-18 05:14:01 +00:00
locale_is-IS.ini i18n: update of translations from Weblate (#4451) 2024-07-18 05:14:01 +00:00
locale_it-IT.ini i18n: update of translations from Weblate (#4783) 2024-08-08 07:16:13 +00:00
locale_ja-JP.ini i18n: update of translations from Weblate (#4451) 2024-07-18 05:14:01 +00:00
locale_ko-KR.ini i18n: update of translations from Weblate (#4451) 2024-07-18 05:14:01 +00:00
locale_lv-LV.ini i18n: update of translations from Weblate (#4451) 2024-07-18 05:14:01 +00:00
locale_ml-IN.ini [I18N] Add common section to new translation files 2024-07-22 20:14:24 +02:00
locale_nl-NL.ini i18n: update of translations from Weblate (#4783) 2024-08-08 07:16:13 +00:00
locale_pl-PL.ini i18n: update of translations from Weblate (#4451) 2024-07-18 05:14:01 +00:00
locale_pt-BR.ini i18n: update of translations from Weblate (#4451) 2024-07-18 05:14:01 +00:00
locale_pt-PT.ini i18n: update of translations from Weblate (#4783) 2024-08-08 07:16:13 +00:00
locale_ru-RU.ini i18n: update of translations from Weblate (#4783) 2024-08-08 07:16:13 +00:00
locale_si-LK.ini Refactor install page hints (#3961) 2024-06-02 13:06:56 +00:00
locale_sk-SK.ini i18n: update of translations from Weblate (#4451) 2024-07-18 05:14:01 +00:00
locale_sl.ini i18n: update of translations from Weblate (#4451) 2024-07-18 05:14:01 +00:00
locale_sr-SP.ini [I18N] Add common section to new translation files 2024-07-22 20:14:24 +02:00
locale_sv-SE.ini i18n: update of translations from Weblate (#4451) 2024-07-18 05:14:01 +00:00
locale_tr-TR.ini i18n: update of translations from Weblate (#4451) 2024-07-18 05:14:01 +00:00
locale_uk-UA.ini i18n: update of translations from Weblate (#4451) 2024-07-18 05:14:01 +00:00
locale_yi.ini i18n: update of translations from Weblate (#4451) 2024-07-18 05:14:01 +00:00
locale_zh-CN.ini i18n: update of translations from Weblate (#4783) 2024-08-08 07:16:13 +00:00
locale_zh-HK.ini i18n: update of translations from Weblate (#4783) 2024-08-08 07:16:13 +00:00
locale_zh-TW.ini i18n: update of translations from Weblate (#4783) 2024-08-08 07:16:13 +00:00
TRANSLATORS Fix missing left and right carets in TRANSLATORS (#21397) 2022-10-10 10:36:37 -04:00