diff --git a/.editorconfig b/.editorconfig
index c0946ac997..722416dfeb 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -26,3 +26,6 @@ indent_style = tab
 
 [*.svg]
 insert_final_newline = false
+
+[options/locale/locale_*.ini]
+insert_final_newline = false
diff --git a/options/locale/locale_ar.ini b/options/locale/locale_ar.ini
index bcd4b6af9f..4879bb1cc6 100644
--- a/options/locale/locale_ar.ini
+++ b/options/locale/locale_ar.ini
@@ -1214,7 +1214,7 @@ settings.pulls_desc = فعّل طلب الدمج في المستودع
 settings.pulls.ignore_whitespace = تجاهل المسافات في النزاعات
 settings.danger_zone = منطقة الخطر
 settings.new_owner_has_same_repo = المالك الجديد لديه مستودع بالاسم نفسه؛ برجاء اختيار اسم آخر.
-settings.transfer = نقل الملكية
+settings.transfer.title = نقل الملكية
 settings.transfer_abort = ألغِ نقل الملكية
 settings.transfer_abort_invalid = لا يمكنك إلغاء عملية غير موجودة لنقل ملكية مستودع.
 settings.transfer.success = نجح نقل ملكية المستودع.
diff --git a/options/locale/locale_bg.ini b/options/locale/locale_bg.ini
index d7093b85d5..260249682e 100644
--- a/options/locale/locale_bg.ini
+++ b/options/locale/locale_bg.ini
@@ -570,7 +570,7 @@ issues.role.owner_helper = Този потребител е притежател
 settings.delete_notices_2 = - Тази операция ще изтрие перманентно хранилището <strong>%s</strong>, включително кода, задачите, коментарите, данните на уикито и настройките за сътрудници.
 settings.admin_settings = Администраторски настройки
 issues.role.owner = Притежател
-settings.transfer = Прехвърляне на притежанието
+settings.transfer.title = Прехвърляне на притежанието
 issues.author = Автор
 issues.closed_at = `затвори тази задача <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 settings.collaborator_deletion_desc = Премахването на сътрудник ще отнеме достъпа му до това хранилище. Продължаване?
diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini
index 9e278f3fd0..accd305630 100644
--- a/options/locale/locale_cs-CZ.ini
+++ b/options/locale/locale_cs-CZ.ini
@@ -2153,7 +2153,7 @@ settings.convert_fork_desc=Tento fork můžete převést na běžný repozitář
 settings.convert_fork_notices_1=Tato operace převede fork na běžný repozitář a nelze ji vrátit zpět.
 settings.convert_fork_confirm=Převést repozitář
 settings.convert_fork_succeed=Fork bylo převeden na běžný repozitář.
-settings.transfer=Předat vlastnictví
+settings.transfer.title=Předat vlastnictví
 settings.transfer.rejected=Převod repozitáře byl zamítnut.
 settings.transfer.success=Převod repozitáře byl úspěšný.
 settings.transfer_abort=Zrušit převod
diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini
index a1a55c4dfa..0828cc4dec 100644
--- a/options/locale/locale_de-DE.ini
+++ b/options/locale/locale_de-DE.ini
@@ -2146,7 +2146,7 @@ settings.convert_fork_desc=Du kannst diesen Fork in ein normales Repository umwa
 settings.convert_fork_notices_1=Dieser Vorgang konvertiert den Fork in ein normales Repository und kann nicht rückgängig gemacht werden.
 settings.convert_fork_confirm=Repository umwandeln
 settings.convert_fork_succeed=Der Fork wurde in ein normales Repository konvertiert.
-settings.transfer=Besitz übertragen
+settings.transfer.title=Besitz übertragen
 settings.transfer.rejected=Repository-Übertragung wurde abgelehnt.
 settings.transfer.success=Repository-Übertragung war erfolgreich.
 settings.transfer_abort=Übertragung abbrechen
diff --git a/options/locale/locale_el-GR.ini b/options/locale/locale_el-GR.ini
index e1264aea00..fbf5cfe235 100644
--- a/options/locale/locale_el-GR.ini
+++ b/options/locale/locale_el-GR.ini
@@ -2145,7 +2145,7 @@ settings.convert_fork_desc=Μπορείτε να μετατρέψετε αυτό
 settings.convert_fork_notices_1=Αυτή η λειτουργία θα μετατρέψει το fork σε ένα κανονικό αποθετήριο και δεν μπορεί να αναιρεθεί.
 settings.convert_fork_confirm=Μετατροπή αποθετηρίου
 settings.convert_fork_succeed=Το fork έχει μετατραπεί σε κανονικό αποθετήριο.
-settings.transfer=Μεταβίβαση ιδιοκτησίας
+settings.transfer.title=Μεταβίβαση ιδιοκτησίας
 settings.transfer.rejected=Η μεταβίβαση του αποθετηρίου απορρίφθηκε.
 settings.transfer.success=Η μεταβίβαση του αποθετηρίου ήταν επιτυχής.
 settings.transfer_abort=Ακύρωση μεταβίβασης
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index b95c72d289..12c4197c67 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -2202,7 +2202,9 @@ settings.convert_fork_desc = You can convert this fork into a regular repository
 settings.convert_fork_notices_1 = This operation will convert the fork into a regular repository and cannot be undone.
 settings.convert_fork_confirm = Convert repository
 settings.convert_fork_succeed = The fork has been converted into a regular repository.
-settings.transfer = Transfer ownership
+settings.transfer.title = Transfer ownership
+settings.transfer.button = Transfer ownership
+settings.transfer.modal.title = Transfer ownership
 settings.transfer.rejected = Repository transfer was rejected.
 settings.transfer.success = Repository transfer was successful.
 settings.transfer_abort = Cancel transfer
diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini
index 7727e930a6..9575ca355b 100644
--- a/options/locale/locale_es-ES.ini
+++ b/options/locale/locale_es-ES.ini
@@ -2109,7 +2109,7 @@ settings.convert_fork_desc=Puede convertir este fork en un repositorio normal. E
 settings.convert_fork_notices_1=Esta operación convertirá el fork en un repositorio regular y no se puede deshacer.
 settings.convert_fork_confirm=Convertir repositorio
 settings.convert_fork_succeed=El fork se ha convertido en un repositorio normal.
-settings.transfer=Transferir la propiedad
+settings.transfer.title=Transferir la propiedad
 settings.transfer.rejected=La transferencia de repositorio fue rechazada.
 settings.transfer.success=La transferencia del repositorio fue exitosa.
 settings.transfer_abort=Cancelar transferencia
diff --git a/options/locale/locale_fa-IR.ini b/options/locale/locale_fa-IR.ini
index fbacfd72c8..c07e906146 100644
--- a/options/locale/locale_fa-IR.ini
+++ b/options/locale/locale_fa-IR.ini
@@ -1595,7 +1595,7 @@ settings.convert_fork_desc=شما می توانید این انشعاب را ب
 settings.convert_fork_notices_1=این عملیات، انشعاب را تبدیل به مخزن عادی خواهد کرد و بازگشت ناپذیر است.
 settings.convert_fork_confirm=تبدیل مخزن
 settings.convert_fork_succeed=انشعاب به یک مخزن عادی تبدیل شده است.
-settings.transfer=انتقال مالکیت
+settings.transfer.title=انتقال مالکیت
 settings.transfer.rejected=انتقال انبار رد شده است.
 settings.transfer.success=انتقال انبار موفق بود.
 settings.transfer_abort=لغو انتقال
diff --git a/options/locale/locale_fi-FI.ini b/options/locale/locale_fi-FI.ini
index 1560075d6b..cee797a170 100644
--- a/options/locale/locale_fi-FI.ini
+++ b/options/locale/locale_fi-FI.ini
@@ -1133,7 +1133,7 @@ settings.tracker_issue_style.alphanumeric=Aakkosnumeerinen
 settings.enable_timetracker=Ota käyttöön ajan seuranta
 settings.danger_zone=Vaaravyöhyke
 settings.new_owner_has_same_repo=Uudella omistajalla on jo samanniminen repo. Ole hyvä ja valitse toinen nimi.
-settings.transfer=Siirrä omistajuus
+settings.transfer.title=Siirrä omistajuus
 settings.transfer_form_title=Syötä repon nimi vahvistuksena:
 settings.transfer_notices_3=- Jos arkisto on yksityinen ja se siirretään yksittäiselle käyttäjälle, tämä toiminto varmistaa, että käyttäjällä on ainakin lukuoikeudet (ja muuttaa käyttöoikeuksia tarvittaessa).
 settings.transfer_owner=Uusi omistaja
diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini
index 8079656d5b..19fb8fc85f 100644
--- a/options/locale/locale_fr-FR.ini
+++ b/options/locale/locale_fr-FR.ini
@@ -2166,7 +2166,7 @@ settings.convert_fork_desc=Vous pouvez convertir cette bifurcation en dépôt st
 settings.convert_fork_notices_1=Cette opération convertira la bifurcation en dépôt standard. Cette action est irréversible.
 settings.convert_fork_confirm=Convertir le dépôt
 settings.convert_fork_succeed=La bifurcation a été convertie en dépôt standard.
-settings.transfer=Changer de propriétaire
+settings.transfer.title=Changer de propriétaire
 settings.transfer.rejected=Le transfert du dépôt a été rejeté.
 settings.transfer.success=Le transfert du dépôt a réussi.
 settings.transfer_abort=Annuler le transfert
diff --git a/options/locale/locale_id-ID.ini b/options/locale/locale_id-ID.ini
index 26e3a9b22d..5370a404f0 100644
--- a/options/locale/locale_id-ID.ini
+++ b/options/locale/locale_id-ID.ini
@@ -869,7 +869,7 @@ settings.tracker_issue_style.numeric=Numerik
 settings.tracker_issue_style.alphanumeric=Alfhanumerik
 settings.danger_zone=Zona Bahaya
 settings.new_owner_has_same_repo=Pemilik baru sudah memiliki repositori dengan nama yang sama. Silakan pilih nama lain.
-settings.transfer=Transfer Kepemilikan
+settings.transfer.title=Transfer Kepemilikan
 settings.transfer_owner=Pemilik Baru
 settings.delete=Menghapus Repositori Ini
 settings.delete_notices_1=- Operasi ini <strong>TIDAK BISA</strong> dibatalkan.
diff --git a/options/locale/locale_is-IS.ini b/options/locale/locale_is-IS.ini
index e448ee4568..9d890773b2 100644
--- a/options/locale/locale_is-IS.ini
+++ b/options/locale/locale_is-IS.ini
@@ -1024,7 +1024,7 @@ settings.use_external_wiki=Nota Utanaðkomandi Handbók
 settings.tracker_issue_style.numeric=Tölugildi
 settings.danger_zone=Hættusvæði
 settings.convert_notices_1=Þessi aðgerð mun breyta speglinum í venjulegt hugbúnaðarsafn og ekki er hægt að afturkalla hana.
-settings.transfer=Flytja Eignarhald
+settings.transfer.title=Flytja Eignarhald
 settings.trust_model.collaboratorcommitter.desc=Gildar undirskriftir frá samstarfsaðilum hugbúnaðarsafnsins verða merktar „traust“ ef þær passa við framlagandan. Að öðrum kosti verða gildar undirskriftir merktar „ótraust“ ef undirskriftin passar við framlagandan og „ósamþykkt“ að öðru leyti. Þetta mun neyða Forgejo til að vera merkt sem framlagandi á undirrituðum framlögum með raunverulega framlagandan merktan sem Co-Authored-By: og Co-Committed-By: í framlaginu. Sjálfgefinn Forgejo lykill verður að passa við notanda í gagnagrunninum.
 settings.wiki_delete_desc=Að eyða handbókargögn er varanlegt og ekki er hægt að afturkalla það.
 settings.delete=Eyða Þetta Hugbúnaðarsafn
diff --git a/options/locale/locale_it-IT.ini b/options/locale/locale_it-IT.ini
index 2af6019eae..367b373252 100644
--- a/options/locale/locale_it-IT.ini
+++ b/options/locale/locale_it-IT.ini
@@ -1946,7 +1946,7 @@ settings.convert_fork_desc=Puoi convertire questo fork in un normale repository.
 settings.convert_fork_notices_1=Questa operazione convertirà il fork in un normale repository e non può essere annullata.
 settings.convert_fork_confirm=Converti progetto
 settings.convert_fork_succeed=Il fork è stato convertito in un repository regolare.
-settings.transfer=Trasferisci proprietà
+settings.transfer.title=Trasferisci proprietà
 settings.transfer.rejected=Il trasferimento del repository è stato rifiutato.
 settings.transfer.success=Il trasferimento del repository è andato a buon fine.
 settings.transfer_abort=Annulla trasferimento
diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini
index 8d06177d2f..4b1ffce9f6 100644
--- a/options/locale/locale_ja-JP.ini
+++ b/options/locale/locale_ja-JP.ini
@@ -2159,7 +2159,7 @@ settings.convert_fork_desc=フォークを通常のリポジトリに変換で
 settings.convert_fork_notices_1=この操作によりフォークから通常のリポジトリに変換されます。 元に戻すことはできません。
 settings.convert_fork_confirm=リポジトリを変換
 settings.convert_fork_succeed=フォークを通常のリポジトリに変換しました。
-settings.transfer=オーナー移転
+settings.transfer.title=オーナー移転
 settings.transfer.rejected=リポジトリの移転は拒否されました。
 settings.transfer.success=リポジトリの移転が成功しました。
 settings.transfer_abort=転送をキャンセル
diff --git a/options/locale/locale_ko-KR.ini b/options/locale/locale_ko-KR.ini
index 07a82eff17..4e3a24a04b 100644
--- a/options/locale/locale_ko-KR.ini
+++ b/options/locale/locale_ko-KR.ini
@@ -1081,7 +1081,7 @@ settings.convert=일반 저장소로 변환
 settings.convert_confirm=저장소 변환
 settings.convert_fork=일반 저장소로 변환
 settings.convert_fork_confirm=저장소 변환
-settings.transfer=소유권 이전
+settings.transfer.title=소유권 이전
 settings.transfer_owner=새 소유자
 settings.transfer_succeed=저장소가 이전 되었습니다.
 settings.trust_model.collaborator=협업자
diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini
index e2ab79e3f8..ba1883acdb 100644
--- a/options/locale/locale_lv-LV.ini
+++ b/options/locale/locale_lv-LV.ini
@@ -2080,7 +2080,7 @@ settings.convert_fork_desc=Jūs varat nomainīt šo atdalīto repozitoriju kā n
 settings.convert_fork_notices_1=Šī darbība mainīs atdalīto repozitoriju uz neatkarīgu repozitoriju un ir neatgriezeniska.
 settings.convert_fork_confirm=Konvertēt repozitoriju
 settings.convert_fork_succeed=Atdalītais repozitorijs tika izmainīts par neatkarīgu repozitoriju.
-settings.transfer=Mainīt īpašnieku
+settings.transfer.title=Mainīt īpašnieku
 settings.transfer.rejected=Repozitorija īpašnieka maiņas pieprasījums tika noraidīts.
 settings.transfer.success=Repozitorija īpašnieka maiņa veiksmīga.
 settings.transfer_abort=Atcelt īpašnieka maiņu
diff --git a/options/locale/locale_nl-NL.ini b/options/locale/locale_nl-NL.ini
index 7c78a30237..a710e5d58a 100644
--- a/options/locale/locale_nl-NL.ini
+++ b/options/locale/locale_nl-NL.ini
@@ -2480,7 +2480,7 @@ settings.reindex_button = Toevoegen aan herindexeringswachtrij
 settings.reindex_requested = Herindexering aangevraagd
 settings.danger_zone = Gevaren zone
 settings.new_owner_has_same_repo = De nieuwe eigenaar heeft al een repository met dezelfde naam. Kies een andere naam.
-settings.transfer = Eigendom overdragen
+settings.transfer.title = Eigendom overdragen
 settings.transfer.success = Repository overdracht was succesvol.
 settings.transfer_abort = Overdracht annuleren
 settings.transfer_abort_success = De repository overdracht naar %s is succesvol geannuleerd.
diff --git a/options/locale/locale_pl-PL.ini b/options/locale/locale_pl-PL.ini
index 3d5adc8561..99ab350b66 100644
--- a/options/locale/locale_pl-PL.ini
+++ b/options/locale/locale_pl-PL.ini
@@ -1665,7 +1665,7 @@ settings.convert_fork_desc=Możesz przekonwertować ten fork w zwykłe repozytor
 settings.convert_fork_notices_1=Ta operacja przekonwertuje fork w zwykłe repozytorium i nie może być cofnięta.
 settings.convert_fork_confirm=Konwertuj repozytorium
 settings.convert_fork_succeed=Fork został przekonwertowany w zwykłe repozytorium.
-settings.transfer=Przeniesienie własności
+settings.transfer.title=Przeniesienie własności
 settings.transfer.rejected=Przeniesienie repozytorium zostało odrzucone.
 settings.transfer.success=Przeniesienie repozytorium powiodło się.
 settings.transfer_abort=Anuluj transfer
diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini
index 27f8f0066a..705c163853 100644
--- a/options/locale/locale_pt-BR.ini
+++ b/options/locale/locale_pt-BR.ini
@@ -2082,7 +2082,7 @@ settings.convert_fork_desc=Você pode converter este fork em um repositório nor
 settings.convert_fork_notices_1=Esta operação irá converter o fork em um repositório normal e não pode ser desfeita.
 settings.convert_fork_confirm=Converter repositório
 settings.convert_fork_succeed=O fork foi convertido em um repositório normal.
-settings.transfer=Transferir propriedade
+settings.transfer.title=Transferir propriedade
 settings.transfer.rejected=A transferência do repositório foi rejeitada.
 settings.transfer.success=A transferência do repositório foi bem sucedida.
 settings.transfer_abort=Cancelar transferência
diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini
index de68e23c86..4a915122f7 100644
--- a/options/locale/locale_pt-PT.ini
+++ b/options/locale/locale_pt-PT.ini
@@ -2168,7 +2168,7 @@ settings.convert_fork_desc=Pode converter esta derivação num repositório norm
 settings.convert_fork_notices_1=Esta operação irá converter a derivação num repositório normal e não poderá ser revertida.
 settings.convert_fork_confirm=Converter repositório
 settings.convert_fork_succeed=A derivação foi convertida num repositório normal.
-settings.transfer=Transferir a propriedade
+settings.transfer.title=Transferir a propriedade
 settings.transfer.rejected=A transferência do repositório foi rejeitada.
 settings.transfer.success=A transferência do repositório foi bem sucedida.
 settings.transfer_abort=Cancelar a transferência
diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini
index f4ee7a1da0..65a927c635 100644
--- a/options/locale/locale_ru-RU.ini
+++ b/options/locale/locale_ru-RU.ini
@@ -2124,7 +2124,7 @@ settings.convert_fork_desc=Вы можете преобразовать это 
 settings.convert_fork_notices_1=Эта операция преобразует этот ответвление в обычный репозиторий, и не может быть отменена.
 settings.convert_fork_confirm=Преобразовать репозиторий
 settings.convert_fork_succeed=Ответвление преобразовано в обычный репозиторий.
-settings.transfer=Передать права собственности
+settings.transfer.title=Передать права собственности
 settings.transfer.rejected=Передача репозитория отменена.
 settings.transfer.success=Передача репозитория выполнена успешно.
 settings.transfer_abort=Отменить передачу
diff --git a/options/locale/locale_si-LK.ini b/options/locale/locale_si-LK.ini
index a0b5f9f4e2..1d133d7570 100644
--- a/options/locale/locale_si-LK.ini
+++ b/options/locale/locale_si-LK.ini
@@ -1537,7 +1537,7 @@ settings.convert_fork_desc=ඔබට මෙම දෙබලක සාමාන
 settings.convert_fork_notices_1=මෙම මෙහෙයුම දෙබලක සාමාන්ය ගබඩාවක් බවට පරිවර්තනය කරන අතර එය අහෝසි කළ නොහැක.
 settings.convert_fork_confirm=පරිවර්තනය කරන්න ගබඩාව
 settings.convert_fork_succeed=මෙම දෙබලක සාමාන්ය ගබඩාවක් බවට පරිවර්තනය කර ඇත.
-settings.transfer=අයිතිය පැවරීම
+settings.transfer.title=අයිතිය පැවරීම
 settings.transfer.rejected=ගබඩාව මාරු කිරීම ප්රතික්ෂේප කරන ලදී.
 settings.transfer.success=ගබඩාව මාරු කිරීම සාර්ථක විය.
 settings.transfer_abort=මාරු කිරීම අවලංගු කරන්න
diff --git a/options/locale/locale_sk-SK.ini b/options/locale/locale_sk-SK.ini
index 43f071a1f2..034d32454f 100644
--- a/options/locale/locale_sk-SK.ini
+++ b/options/locale/locale_sk-SK.ini
@@ -1168,7 +1168,7 @@ settings.convert_fork_desc=Tento fork môžete previesť na bežný repozitár.
 settings.convert_fork_notices_1=Táto operácia skonvertuje fork na bežný repozitár a nedá sa vrátiť späť.
 settings.convert_fork_confirm=Konvertovať repozitár
 settings.convert_fork_succeed=Fork bol prevedený na bežný repozitár.
-settings.transfer=Previesť vlastníctvo
+settings.transfer.title=Previesť vlastníctvo
 settings.transfer_notices_1=- Ak prenesiete repozitár na užívateľa, stratíte k nemu prístup.
 settings.transfer_notices_2=- Prístup k repozitáru si ponecháte, ak ho prevediete na organizáciu, ktorú (spolu)vlastníte.
 settings.transfer_owner=Nový vlastník
diff --git a/options/locale/locale_sv-SE.ini b/options/locale/locale_sv-SE.ini
index 61190fae34..0e7529774c 100644
--- a/options/locale/locale_sv-SE.ini
+++ b/options/locale/locale_sv-SE.ini
@@ -1288,7 +1288,7 @@ settings.convert_confirm=Konvertera utvecklingskatalog
 settings.convert_succeed=Speglingen har blivit konverterad till en vanlig utvecklingskatalog.
 settings.convert_fork=Konvertera till vanlig utvecklingskatalog
 settings.convert_fork_confirm=Konvertera utvecklingskatalog
-settings.transfer=Överför Ägarskap
+settings.transfer.title=Överför Ägarskap
 settings.transfer_desc=Överför denna utvecklingskatalog till en användare eller organisation för vilken du har administratörsrättigheter till.
 settings.transfer_form_title=Ange utvecklingskatalogens namn för att bekräfta:
 settings.transfer_notices_1=- Du kommer förlora åtkomst till denna utvecklingskatalog om du för över den till en individuell användare.
diff --git a/options/locale/locale_tr-TR.ini b/options/locale/locale_tr-TR.ini
index c2c5385421..02a3a2dc08 100644
--- a/options/locale/locale_tr-TR.ini
+++ b/options/locale/locale_tr-TR.ini
@@ -2094,7 +2094,7 @@ settings.convert_fork_desc=Bu çatalı normal bir depoya dönüştürebilirsiniz
 settings.convert_fork_notices_1=Bu işlem çatalı normal bir depoya dönüştürür ve geri alınamaz.
 settings.convert_fork_confirm=Depoyu Dönüştür
 settings.convert_fork_succeed=Çatal normal bir depoya dönüştürüldü.
-settings.transfer=Sahipliği Aktar
+settings.transfer.title=Sahipliği Aktar
 settings.transfer.rejected=Depo aktarımı reddedildi.
 settings.transfer.success=Depo aktarımı başarıyla tamamlandı.
 settings.transfer_abort=Aktarımı iptal et
diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini
index 137ee205fa..482d27b504 100644
--- a/options/locale/locale_uk-UA.ini
+++ b/options/locale/locale_uk-UA.ini
@@ -1654,7 +1654,7 @@ settings.convert_fork_desc=Ви можете перетворити цей фо
 settings.convert_fork_notices_1=Ця операція перетворить форк на звичайний репозиторій та не може бути скасованою.
 settings.convert_fork_confirm=Перетворити репозиторій
 settings.convert_fork_succeed=Цей форк успішно перетворено на звичайний репозиторій.
-settings.transfer=Передати новому власнику
+settings.transfer.title=Передати новому власнику
 settings.transfer.rejected=Перенесення репозиторію відхилено.
 settings.transfer.success=Перенесення репозиторію виконано.
 settings.transfer_abort=Скасувати перенесення
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index 8bdc11b7b2..af58a3da72 100644
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -2167,7 +2167,7 @@ settings.convert_fork_desc=您可以将该镜像仓库转换为普通仓库，
 settings.convert_fork_notices_1=该操作会将派生仓库转换为普通仓库，但该操作不可逆。
 settings.convert_fork_confirm=转换仓库
 settings.convert_fork_succeed=此派生仓库已经转换为普通仓库。
-settings.transfer=转让仓库所有权
+settings.transfer.title=转让仓库所有权
 settings.transfer.rejected=代码库转移被拒绝。
 settings.transfer.success=代码库转移成功。
 settings.transfer_abort=取消转移
diff --git a/options/locale/locale_zh-HK.ini b/options/locale/locale_zh-HK.ini
index adc6f2aeef..4e5be41392 100644
--- a/options/locale/locale_zh-HK.ini
+++ b/options/locale/locale_zh-HK.ini
@@ -592,7 +592,7 @@ settings.tracker_issue_style.numeric=數字
 settings.tracker_issue_style.alphanumeric=字母及數字
 settings.danger_zone=危險操作區
 settings.new_owner_has_same_repo=新的儲存庫擁有者已經存在同名儲存庫！
-settings.transfer=轉移儲存庫所有權
+settings.transfer.title=轉移儲存庫所有權
 settings.transfer_owner=新擁有者
 settings.delete=刪除本儲存庫
 settings.delete_notices_1=- 此操作 <strong>不可以</strong> 被回滾。
diff --git a/options/locale/locale_zh-TW.ini b/options/locale/locale_zh-TW.ini
index 44855f480f..0a17b021b1 100644
--- a/options/locale/locale_zh-TW.ini
+++ b/options/locale/locale_zh-TW.ini
@@ -2010,7 +2010,7 @@ settings.convert_fork_desc=您可以將此 fork 轉換成普通儲存庫。此
 settings.convert_fork_notices_1=此操作會將此 fork 轉換成普通儲存庫且不可還原。
 settings.convert_fork_confirm=轉換儲存庫
 settings.convert_fork_succeed=此 fork 已轉換成普通儲存庫。
-settings.transfer=轉移儲存庫所有權
+settings.transfer.title=轉移儲存庫所有權
 settings.transfer.rejected=儲存庫轉移被拒絕。
 settings.transfer.success=儲存庫已成功轉移。
 settings.transfer_abort=取消轉移
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index 979df1f5cf..0c68a7a970 100644
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -439,7 +439,7 @@
 				{{end}}
 				<div class="flex-item">
 					<div class="flex-item-main">
-						<div class="flex-item-title">{{ctx.Locale.Tr "repo.settings.transfer"}}</div>
+						<div class="flex-item-title">{{ctx.Locale.Tr "repo.settings.transfer.title"}}</div>
 						<div class="flex-item-body">
 							{{if .RepoTransfer}}
 								{{ctx.Locale.Tr "repo.settings.transfer_started" .RepoTransfer.Recipient.DisplayName}}
@@ -456,7 +456,7 @@
 								<button class="ui red button">{{ctx.Locale.Tr "repo.settings.transfer_abort"}}</button>
 							</form>
 						{{else}}
-							<button class="ui basic red show-modal button" data-modal="#transfer-repo-modal">{{ctx.Locale.Tr "repo.settings.transfer"}}</button>
+							<button class="ui basic red show-modal button" data-modal="#transfer-repo-modal">{{ctx.Locale.Tr "repo.settings.transfer.button"}}</button>
 						{{end}}
 					</div>
 				</div>
@@ -584,7 +584,7 @@
 	{{end}}
 	<div class="ui small modal" id="transfer-repo-modal">
 		<div class="header">
-			{{ctx.Locale.Tr "repo.settings.transfer"}}
+			{{ctx.Locale.Tr "repo.settings.transfer.modal.title"}}
 		</div>
 		<div class="content">
 			<div class="ui warning message">