diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini
index 0c61e5d042..acc0d0bc27 100644
--- a/options/locale/locale_cs-CZ.ini
+++ b/options/locale/locale_cs-CZ.ini
@@ -1537,9 +1537,7 @@ issues.no_content=K dispozici není žádný popis.
 issues.close=Zavřít problém
 issues.comment_pull_merged_at=sloučený commit %[1]s do %[2]s %[3]s
 issues.comment_manually_pull_merged_at=ručně sloučený commit %[1]s do %[2]s %[3]s
-issues.close_comment_issue=Okomentovat a zavřít
 issues.reopen_issue=Znovuotevřít
-issues.reopen_comment_issue=Okomentovat a znovuotevřít
 issues.create_comment=Okomentovat
 issues.comment.blocked_user=Nemůžete vytvořit nebo upravovat komentář, protože jste zablokováni zadavatelem příspěvku nebo vlastníkem repozitáře.
 issues.closed_at=`uzavřel/a tento úkol <a id="%[1]s" href="#%[1]s">%[2]s</a>`
diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini
index 8e1194cdd1..8b6296cfdc 100644
--- a/options/locale/locale_de-DE.ini
+++ b/options/locale/locale_de-DE.ini
@@ -1540,9 +1540,7 @@ issues.no_content=Keine Beschreibung angegeben.
 issues.close=Issue schließen
 issues.comment_pull_merged_at=hat Commit %[1]s in %[2]s %[3]s gemerged
 issues.comment_manually_pull_merged_at=hat Commit %[1]s in %[2]s %[3]s manuell gemerged
-issues.close_comment_issue=Kommentieren und schließen
 issues.reopen_issue=Wieder öffnen
-issues.reopen_comment_issue=Kommentieren und wieder öffnen
 issues.create_comment=Kommentieren
 issues.comment.blocked_user=Der Kommentar kann nicht erstellt oder bearbeitet werden, da du vom Repository-Eigentümer blockiert wurdest.
 issues.closed_at=`hat diesen Issue <a id="%[1]s" href="#%[1]s">%[2]s</a> geschlossen`
diff --git a/options/locale/locale_el-GR.ini b/options/locale/locale_el-GR.ini
index 74262ff38d..7e6e2ba2cd 100644
--- a/options/locale/locale_el-GR.ini
+++ b/options/locale/locale_el-GR.ini
@@ -1463,9 +1463,7 @@ issues.no_content=Δεν υπάρχει περιγραφή.
 issues.close=Κλείσιμο Ζητήματος
 issues.comment_pull_merged_at=συγχώνευσε την υποβολή %[1]s στο %[2]s %[3]s
 issues.comment_manually_pull_merged_at=συγχώνευσε χειροκίνητα την υποβολή %[1]s στο %[2]s %[3]s
-issues.close_comment_issue=Σχόλιο και κλείσιμο
 issues.reopen_issue=Ανοίξτε ξανά
-issues.reopen_comment_issue=Σχόλιο και Άνοιγμα ξανά
 issues.create_comment=Προσθήκη Σχολίου
 issues.closed_at=`αυτό το ζήτημα έκλεισε <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.reopened_at=`ξανά άνοιξε αυτό το ζήτημα <a id="%[1]s" href="#%[1]s">%[2]s</a>`
diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini
index 66273eb79a..8c0dc836fd 100644
--- a/options/locale/locale_es-ES.ini
+++ b/options/locale/locale_es-ES.ini
@@ -1456,9 +1456,7 @@ issues.no_content=No se ha proporcionado una descripción.
 issues.close=Cerrar Incidencia
 issues.comment_pull_merged_at=commit fusionado %[1]s en %[2]s %[3]s
 issues.comment_manually_pull_merged_at=commit manualmente fusionado %[1]s en %[2]s %[3]s
-issues.close_comment_issue=Comentar y cerrar
 issues.reopen_issue=Reabrir
-issues.reopen_comment_issue=Comentar y reabrir
 issues.create_comment=Comentar
 issues.closed_at=`cerró esta incidencia <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.reopened_at=`reabrió esta incidencia <a id="%[1]s" href="#%[1]s">%[2]s</a>`
diff --git a/options/locale/locale_fa-IR.ini b/options/locale/locale_fa-IR.ini
index 94e572f9b4..2cc770ef09 100644
--- a/options/locale/locale_fa-IR.ini
+++ b/options/locale/locale_fa-IR.ini
@@ -1120,9 +1120,7 @@ issues.context.quote_reply=پاسخ نقل و قول
 issues.context.reference_issue=مرجع در شماره جدید
 issues.context.edit=ویرایش
 issues.context.delete=حذف
-issues.close_comment_issue=ثبت دیدگاه و بستن
 issues.reopen_issue=بازگشایی
-issues.reopen_comment_issue=ثبت دیدگاه و بازگشایی
 issues.create_comment=دیدگاه
 issues.closed_at=`<a id="%[1]s" href="#%[1]s">%[2]s</a> این موضوع را بست`
 issues.reopened_at=`<a id="%[1]s" href="#%[1]s">%[2]s</a> این موضوع را دوباره باز کرد`
diff --git a/options/locale/locale_fi-FI.ini b/options/locale/locale_fi-FI.ini
index d854e74e61..be0f1f5b64 100644
--- a/options/locale/locale_fi-FI.ini
+++ b/options/locale/locale_fi-FI.ini
@@ -888,9 +888,7 @@ issues.context.quote_reply=Vastaa lainaamalla
 issues.context.reference_issue=Viittaa uudesa ongelmassa
 issues.context.edit=Muokkaa
 issues.context.delete=Poista
-issues.close_comment_issue=Kommentoi ja sulje
 issues.reopen_issue=Avaa uudelleen
-issues.reopen_comment_issue=Kommentoi ja avaa uudelleen
 issues.create_comment=Kommentoi
 issues.closed_at=`sulki tämän ongelman <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.reopened_at=`uudelleenavasi tämän ongelman <a id="%[1]s" href="#%[1]s">%[2]s</a>`
diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini
index 0def8f81d1..9a1a756264 100644
--- a/options/locale/locale_fr-FR.ini
+++ b/options/locale/locale_fr-FR.ini
@@ -1477,9 +1477,7 @@ issues.no_content=Sans contenu.
 issues.close=Fermer le ticket
 issues.comment_pull_merged_at=a fusionné la révision %[1]s dans %[2]s %[3]s
 issues.comment_manually_pull_merged_at=a fusionné manuellement la révision %[1]s dans %[2]s %[3]s
-issues.close_comment_issue=Commenter et Fermer
 issues.reopen_issue=Rouvrir
-issues.reopen_comment_issue=Commenter et Réouvrir
 issues.create_comment=Commenter
 issues.closed_at=`a fermé ce ticket <a id="%[1]s" href="#%[1]s">%[2]s</a>.`
 issues.reopened_at=`a réouvert ce ticket <a id="%[1]s" href="#%[1]s">%[2]s</a>.`
diff --git a/options/locale/locale_hu-HU.ini b/options/locale/locale_hu-HU.ini
index 06eb31f308..617c7d10c0 100644
--- a/options/locale/locale_hu-HU.ini
+++ b/options/locale/locale_hu-HU.ini
@@ -826,9 +826,7 @@ issues.context.copy_link=Hivatkozás másolása
 issues.context.quote_reply=Válasz idézettel
 issues.context.edit=Szerkesztés
 issues.context.delete=Törlés
-issues.close_comment_issue=Hozzászólás és lezárás
 issues.reopen_issue=Újranyitás
-issues.reopen_comment_issue=Hozzászólás és újranyitás
 issues.create_comment=Hozzászólás
 issues.commit_ref_at=`hivatkozott erre a hibajegyre egy commit-ból <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.role.owner=Tulajdonos
diff --git a/options/locale/locale_id-ID.ini b/options/locale/locale_id-ID.ini
index a6bac362ab..cd3257dfde 100644
--- a/options/locale/locale_id-ID.ini
+++ b/options/locale/locale_id-ID.ini
@@ -705,9 +705,7 @@ issues.context.copy_link=Salin tautan
 issues.context.quote_reply=Kutip Balasan
 issues.context.edit=Sunting
 issues.context.delete=Hapus
-issues.close_comment_issue=Komentar dan Tutup
 issues.reopen_issue=Buka kembali
-issues.reopen_comment_issue=Komentar dan Buka Kembali
 issues.create_comment=Komentar
 issues.commit_ref_at=`merujuk masalah dari komit <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.role.owner=Pemilik
diff --git a/options/locale/locale_is-IS.ini b/options/locale/locale_is-IS.ini
index f6becbf1c0..1ec4d990cf 100644
--- a/options/locale/locale_is-IS.ini
+++ b/options/locale/locale_is-IS.ini
@@ -791,9 +791,7 @@ issues.num_comments=%d ummæli
 issues.commented_at=`gerði ummæli <a href="#%s">%s</a>`
 issues.context.edit=Breyta
 issues.context.delete=Eyða
-issues.close_comment_issue=Senda ummæli og Loka
 issues.reopen_issue=Enduropna
-issues.reopen_comment_issue=Senda ummæli og Enduropna
 issues.create_comment=Senda Ummæli
 issues.closed_at=`lokaði þessu vandamáli <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.reopened_at=`enduropnaði þetta vandamál <a id="%[1]s" href="#%[1]s">%[2]s</a>`
diff --git a/options/locale/locale_it-IT.ini b/options/locale/locale_it-IT.ini
index a32ae01868..1f9e4e6a8e 100644
--- a/options/locale/locale_it-IT.ini
+++ b/options/locale/locale_it-IT.ini
@@ -1213,9 +1213,7 @@ issues.context.quote_reply=Quota risposta
 issues.context.reference_issue=Fai riferimento in un nuovo problema
 issues.context.edit=Modifica
 issues.context.delete=Elimina
-issues.close_comment_issue=Commenta e Chiudi
 issues.reopen_issue=Riapri
-issues.reopen_comment_issue=Commenta e Riapri
 issues.create_comment=Commento
 issues.closed_at=`chiuso questo probleam <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.reopened_at=`riaperto questo problema <a id="%[1]s" href="#%[1]s">%[2]s</a>`
diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini
index 07c1cbfe7e..89df5ac0b9 100644
--- a/options/locale/locale_ja-JP.ini
+++ b/options/locale/locale_ja-JP.ini
@@ -1552,9 +1552,7 @@ issues.no_content=説明はありません。
 issues.close=イシューをクローズ
 issues.comment_pull_merged_at=がコミット %[1]s を %[2]s にマージ %[3]s
 issues.comment_manually_pull_merged_at=がコミット %[1]s を %[2]s に手動マージ %[3]s
-issues.close_comment_issue=コメントしてクローズ
 issues.reopen_issue=再オープンする
-issues.reopen_comment_issue=コメントして再オープン
 issues.create_comment=コメントする
 issues.comment.blocked_user=投稿者またはリポジトリのオーナーがあなたをブロックしているため、コメントの作成や編集はできません。
 issues.closed_at=`がイシューをクローズ <a id="%[1]s" href="#%[1]s">%[2]s</a>`
diff --git a/options/locale/locale_ko-KR.ini b/options/locale/locale_ko-KR.ini
index 054632e819..c5bf621c47 100644
--- a/options/locale/locale_ko-KR.ini
+++ b/options/locale/locale_ko-KR.ini
@@ -754,9 +754,7 @@ issues.commented_at=`코멘트됨, <a href="#%s">%s</a>`
 issues.delete_comment_confirm=이 댓글을 정말 삭제하시겠습니까?
 issues.context.edit=수정하기
 issues.context.delete=삭제
-issues.close_comment_issue=클로즈 및 코멘트
 issues.reopen_issue=다시 열기
-issues.reopen_comment_issue=다시 오픈 및 코멘트
 issues.create_comment=코멘트
 issues.commit_ref_at=` 커밋 <a id="%[1]s" href="#%[1]s">%[2]s</a>에서 이 이슈 언급`
 issues.role.owner=소유자
diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini
index 8f9766b082..120d8f3407 100644
--- a/options/locale/locale_lv-LV.ini
+++ b/options/locale/locale_lv-LV.ini
@@ -1465,9 +1465,7 @@ issues.no_content=Nav sniegts apraksts.
 issues.close=Slēgt problēmu
 issues.comment_pull_merged_at=saplidināta revīzija %[1]s atzarā %[2]s %[3]s
 issues.comment_manually_pull_merged_at=manuāli saplidināta revīzija %[1]s atzarā %[2]s %[3]s
-issues.close_comment_issue=Komentēt un aizvērt
 issues.reopen_issue=Atvērt atkārtoti
-issues.reopen_comment_issue=Komentēt un atvērt atkārtoti
 issues.create_comment=Komentēt
 issues.closed_at=`slēdza šo problēmu <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.reopened_at=`atkārtoti atvēra šo problēmu <a id="%[1]s" href="#%[1]s">%[2]s</a>`
diff --git a/options/locale/locale_nl-NL.ini b/options/locale/locale_nl-NL.ini
index adcbc6b66d..1b232fbf27 100644
--- a/options/locale/locale_nl-NL.ini
+++ b/options/locale/locale_nl-NL.ini
@@ -1211,9 +1211,7 @@ issues.context.quote_reply=Citeer antwoord
 issues.context.reference_issue=Verwijs in nieuw issue
 issues.context.edit=Bewerken
 issues.context.delete=Verwijder
-issues.close_comment_issue=Reageer en sluit
 issues.reopen_issue=Heropen
-issues.reopen_comment_issue=Heropen en geef commentaar
 issues.create_comment=Reageer
 issues.closed_at=`heeft dit probleem gesloten <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.reopened_at=`heropende dit probleem <a id="%[1]s" href="#%[1]s">%[2]s</a>`
diff --git a/options/locale/locale_pl-PL.ini b/options/locale/locale_pl-PL.ini
index 6fdec5183e..0807ae9478 100644
--- a/options/locale/locale_pl-PL.ini
+++ b/options/locale/locale_pl-PL.ini
@@ -1115,9 +1115,7 @@ issues.context.copy_link=Skopiuj link
 issues.context.quote_reply=Cytuj odpowiedź
 issues.context.edit=Edytuj
 issues.context.delete=Usuń
-issues.close_comment_issue=Skomentuj i zamknij
 issues.reopen_issue=Otwórz ponownie
-issues.reopen_comment_issue=Skomentuj i otwórz ponownie
 issues.create_comment=Skomentuj
 issues.closed_at=`zamknął(-ęła) to zgłoszenie <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.reopened_at=`otworzył(-a) ponownie to zgłoszenie <a id="%[1]s" href="#%[1]s">%[2]s</a>`
diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini
index 222abc1681..ec45e839c0 100644
--- a/options/locale/locale_pt-BR.ini
+++ b/options/locale/locale_pt-BR.ini
@@ -1461,9 +1461,7 @@ issues.no_content=Nenhuma descrição fornecida.
 issues.close=Fechar issue
 issues.comment_pull_merged_at=aplicou o merge do commit %[1]s em %[2]s %[3]s
 issues.comment_manually_pull_merged_at=aplicou o merge manual do commit %[1]s em %[2]s %[3]s
-issues.close_comment_issue=Comentar e fechar
 issues.reopen_issue=Reabrir
-issues.reopen_comment_issue=Comentar e reabrir
 issues.create_comment=Comentar
 issues.closed_at=`fechou esta issue <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.reopened_at=`reabriu esta issue <a id="%[1]s" href="#%[1]s">%[2]s</a>`
diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini
index 4c05d7410e..f444cf6072 100644
--- a/options/locale/locale_pt-PT.ini
+++ b/options/locale/locale_pt-PT.ini
@@ -1554,9 +1554,7 @@ issues.no_content=Nenhuma descrição fornecida.
 issues.close=Encerrar questão
 issues.comment_pull_merged_at=cometimento %[1]s integrado em %[2]s %[3]s
 issues.comment_manually_pull_merged_at=cometimento %[1]s integrado manualmente em %[2]s %[3]s
-issues.close_comment_issue=Comentar e fechar
 issues.reopen_issue=Reabrir
-issues.reopen_comment_issue=Comentar e reabrir
 issues.create_comment=Comentar
 issues.comment.blocked_user=Não pode criar ou editar o comentário porque foi bloqueado/a pelo remetente ou pelo/a proprietário/a do repositório.
 issues.closed_at=`encerrou esta questão <a id="%[1]s" href="#%[1]s">%[2]s</a>`
diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini
index 33634105ff..464d602037 100644
--- a/options/locale/locale_ru-RU.ini
+++ b/options/locale/locale_ru-RU.ini
@@ -1440,9 +1440,7 @@ issues.no_content=Описание отсутствует.
 issues.close=Закрыть задачу
 issues.comment_pull_merged_at=слил(а) коммит %[1]s в %[2]s %[3]s
 issues.comment_manually_pull_merged_at=вручную слил(а) коммит %[1]s в %[2]s %[3]s
-issues.close_comment_issue=Прокомментировать и закрыть
 issues.reopen_issue=Открыть снова
-issues.reopen_comment_issue=Прокомментировать и открыть снова
 issues.create_comment=Комментировать
 issues.closed_at=`закрыл(а) эту задачу <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.reopened_at=`переоткрыл(а) эту проблему <a id="%[1]s" href="#%[1]s">%[2]s</a>`
diff --git a/options/locale/locale_si-LK.ini b/options/locale/locale_si-LK.ini
index 16c11ef713..4d839b0977 100644
--- a/options/locale/locale_si-LK.ini
+++ b/options/locale/locale_si-LK.ini
@@ -1084,9 +1084,7 @@ issues.context.quote_reply=පිළිතුර උපුටා
 issues.context.reference_issue=නව නිකුතුවක යොමු කිරීම
 issues.context.edit=සංස්කරණය
 issues.context.delete=මකන්න
-issues.close_comment_issue=අදහස් දක්වා වසන්න
 issues.reopen_issue=නැවත විවෘත කරන්න
-issues.reopen_comment_issue=අදහස් දක්වා විවෘත කරන්න
 issues.create_comment=අදහස
 issues.closed_at=`මෙම ගැටළුව වසා <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.reopened_at=`මෙම ගැටළුව නැවත විවෘත කරන ලදි <a id="%[1]s" href="#%[1]s">%[2]s</a>`
diff --git a/options/locale/locale_sv-SE.ini b/options/locale/locale_sv-SE.ini
index ee729911c3..56c7dc2fb3 100644
--- a/options/locale/locale_sv-SE.ini
+++ b/options/locale/locale_sv-SE.ini
@@ -929,9 +929,7 @@ issues.context.quote_reply=Citerat svar
 issues.context.reference_issue=Referens i nytt ärende
 issues.context.edit=Redigera
 issues.context.delete=Ta bort
-issues.close_comment_issue=Kommentera och stäng
 issues.reopen_issue=Återöppna
-issues.reopen_comment_issue=Kommentera och återöppna
 issues.create_comment=Kommentera
 issues.closed_at=`stängde ärendet <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.reopened_at=`återöppnade detta ärende <a id="%[1]s" href="#%[1]s">%[2]s</a>`
diff --git a/options/locale/locale_tr-TR.ini b/options/locale/locale_tr-TR.ini
index f1ef7bd648..505f5743cd 100644
--- a/options/locale/locale_tr-TR.ini
+++ b/options/locale/locale_tr-TR.ini
@@ -1551,9 +1551,7 @@ issues.no_content=Herhangi bir açıklama sağlanmadı.
 issues.close=Konuyu Kapat
 issues.comment_pull_merged_at=%[1]s işlemesi, %[2]s dalına birleştirildi %[3]s
 issues.comment_manually_pull_merged_at=%[1]s işlemesi, %[2]s dalına elle birleştirildi %[3]s
-issues.close_comment_issue=Yorum Yap ve Kapat
 issues.reopen_issue=Yeniden aç
-issues.reopen_comment_issue=Yorum Yap ve Yeniden Aç
 issues.create_comment=Yorum yap
 issues.comment.blocked_user=Yorum oluşturulamıyor veya düzenlenemiyor, gönderen veya depo sahibi tarafından engellenmişsiniz.
 issues.closed_at=`<a id="%[1]s" href="#%[1]s">%[2]s</a> konusunu kapattı`
diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini
index cc06c87d32..4b7bf86de8 100644
--- a/options/locale/locale_uk-UA.ini
+++ b/options/locale/locale_uk-UA.ini
@@ -1130,9 +1130,7 @@ issues.context.quote_reply=Цитувати відповідь
 issues.context.reference_issue=Посилання в новій задачі
 issues.context.edit=Редагувати
 issues.context.delete=Видалити
-issues.close_comment_issue=Прокоментувати і закрити
 issues.reopen_issue=Відкрити знову
-issues.reopen_comment_issue=Прокоментувати та відкрити знову
 issues.create_comment=Коментар
 issues.closed_at=`закрив цю задачу <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.reopened_at=`повторно відкрив цю задачу <a id="%[1]s" href="#%[1]s">%[2]s</a>`
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index 2d191521d6..7485d4d68f 100644
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -1378,6 +1378,7 @@ commitstatus.success=成功
 ext_issues=访问外部工单
 ext_issues.desc=链接到外部工单跟踪系统。
 
+projects.desc=在项目看板中管理工单和合并请求。
 projects.description=描述(可选)
 projects.description_placeholder=描述
 projects.create=创建项目
@@ -1441,6 +1442,7 @@ issues.new.clear_assignees=取消指派成员
 issues.new.no_assignees=未指派成员
 issues.new.no_reviewers=无审核者
 issues.new.blocked_user=无法创建工单，因为您已被仓库所有者屏蔽。
+issues.edit.already_changed=无法保存对工单的更改。其内容似乎已被其他用户更改。 请刷新页面并重新编辑以避免覆盖他们的更改
 issues.edit.blocked_user=无法编辑内容，因为您已被仓库所有者或工单创建者屏蔽。
 issues.choose.get_started=开始
 issues.choose.open_external_link=开启
@@ -1552,9 +1554,7 @@ issues.no_content=没有提供说明。
 issues.close=关闭工单
 issues.comment_pull_merged_at=已合并提交 %[1]s 到 %[2]s %[3]s
 issues.comment_manually_pull_merged_at=手动合并提交 %[1]s 到 %[2]s %[3]s
-issues.close_comment_issue=评论并关闭
 issues.reopen_issue=重新开启
-issues.reopen_comment_issue=评论并重新开启
 issues.create_comment=评论
 issues.comment.blocked_user=无法创建或编辑评论，因为您已被仓库所有者或工单创建者屏蔽。
 issues.closed_at=`于 <a id="%[1]s" href="#%[1]s">%[2]s</a> 关闭此工单`
@@ -1756,6 +1756,7 @@ compare.compare_head=比较
 pulls.desc=启用合并请求和代码评审。
 pulls.new=创建合并请求
 pulls.new.blocked_user=无法创建合并请求，因为您已被仓库所有者屏蔽。
+pulls.edit.already_changed=无法保存对合并请求的更改。其内容似乎已被其他用户更改。 请刷新页面并重新编辑以避免覆盖他们的更改
 pulls.view=查看拉取请求
 pulls.compare_changes=创建合并请求
 pulls.allow_edits_from_maintainers=允许维护者编辑
@@ -1901,6 +1902,7 @@ pulls.recently_pushed_new_branches=您已经于%[2]s推送了分支 <strong>%[1]
 
 pull.deleted_branch=(已删除): %s
 
+comments.edit.already_changed=无法保存对评论的更改。其内容似乎已被其他用户更改。 请刷新页面并重新编辑以避免覆盖他们的更改
 
 milestones.new=新的里程碑
 milestones.closed=于 %s关闭
@@ -3637,6 +3639,7 @@ runs.pushed_by=推送者
 runs.invalid_workflow_helper=工作流配置文件无效。请检查您的配置文件： %s
 runs.no_matching_online_runner_helper=没有匹配标签的在线 runner： %s
 runs.no_job_without_needs=工作流必须包含至少一个没有依赖关系的作业。
+runs.no_job=工作流必须包含至少一个作业
 runs.actor=操作者
 runs.status=状态
 runs.actors_no_select=所有操作者
diff --git a/options/locale/locale_zh-TW.ini b/options/locale/locale_zh-TW.ini
index c3590b6acc..ae703233e8 100644
--- a/options/locale/locale_zh-TW.ini
+++ b/options/locale/locale_zh-TW.ini
@@ -1339,9 +1339,7 @@ issues.context.reference_issue=新增問題並參考
 issues.context.edit=編輯
 issues.context.delete=刪除
 issues.close=關閉問題
-issues.close_comment_issue=留言並關閉
 issues.reopen_issue=重新開放
-issues.reopen_comment_issue=留言並重新開放
 issues.create_comment=留言
 issues.closed_at=`關閉了這個問題 <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.reopened_at=`重新開放了這個問題 <a id="%[1]s" href="#%[1]s">%[2]s</a>`