From ff2cd21b8a6eed66b71737fa1a2ee4b2f637a287 Mon Sep 17 00:00:00 2001 From: therealrinku Date: Sat, 4 Oct 2025 14:10:31 +0545 Subject: [PATCH 1/8] fix: update tooltips on resolve a thread and reopen a thread buttons --- .../batch_comments/mixins/resolved_status.js | 4 ++-- doc/user/project/merge_requests/reviews/_index.md | 2 +- locale/bg/gitlab.po | 8 ++++---- locale/cs_CZ/gitlab.po | 8 ++++---- locale/da_DK/gitlab.po | 8 ++++---- locale/de/gitlab.po | 8 ++++---- locale/eo/gitlab.po | 8 ++++---- locale/es/gitlab.po | 8 ++++---- locale/fil_PH/gitlab.po | 8 ++++---- locale/fr/gitlab.po | 8 ++++---- locale/ga_IE/gitlab.po | 8 ++++---- locale/gitlab.pot | 12 ++++++------ locale/gl_ES/gitlab.po | 8 ++++---- locale/id_ID/gitlab.po | 8 ++++---- locale/it/gitlab.po | 8 ++++---- locale/ja/gitlab.po | 8 ++++---- locale/ko/gitlab.po | 8 ++++---- locale/nb_NO/gitlab.po | 8 ++++---- locale/nl_NL/gitlab.po | 8 ++++---- locale/pl_PL/gitlab.po | 8 ++++---- locale/pt_BR/gitlab.po | 4 ++-- locale/ro_RO/gitlab.po | 8 ++++---- locale/ru/gitlab.po | 8 ++++---- locale/si_LK/gitlab.po | 8 ++++---- locale/tr_TR/gitlab.po | 8 ++++---- locale/uk/gitlab.po | 4 ++-- locale/zh_CN/gitlab.po | 8 ++++---- locale/zh_HK/gitlab.po | 8 ++++---- locale/zh_TW/gitlab.po | 8 ++++---- spec/frontend/notes/components/note_actions_spec.js | 2 +- 30 files changed, 110 insertions(+), 110 deletions(-) diff --git a/app/assets/javascripts/batch_comments/mixins/resolved_status.js b/app/assets/javascripts/batch_comments/mixins/resolved_status.js index 8f875628a9f1ea..3d50d5913df25b 100644 --- a/app/assets/javascripts/batch_comments/mixins/resolved_status.js +++ b/app/assets/javascripts/batch_comments/mixins/resolved_status.js @@ -39,9 +39,9 @@ export default { ? s__('MergeRequests|Thread stays resolved') : s__('MergeRequests|Thread will be resolved'); } else if (discussionResolved) { - message = s__('MergeRequests|Thread will be open'); + message = s__('MergeRequests|Reopen the thread'); } else if (this.$options.showStaysResolved) { - message = s__('MergeRequests|Thread stays open'); + message = s__('MergeRequests|Close the thread'); } return message; diff --git a/doc/user/project/merge_requests/reviews/_index.md b/doc/user/project/merge_requests/reviews/_index.md index 9e75a9f7bc978e..86e2d12f1c4d9b 100644 --- a/doc/user/project/merge_requests/reviews/_index.md +++ b/doc/user/project/merge_requests/reviews/_index.md @@ -196,7 +196,7 @@ Pending comments display information about delayed actions. GitLab does not perf until you publish the comment: - {{< icon name="check-circle-filled" >}} Resolves thread. -- {{< icon name="check-circle" >}} Thread stays open. +- {{< icon name="check-circle" >}} Close the thread. ## Submit a review diff --git a/locale/bg/gitlab.po b/locale/bg/gitlab.po index 4adf787d9fb6bc..a826afc105045d 100644 --- a/locale/bg/gitlab.po +++ b/locale/bg/gitlab.po @@ -40669,14 +40669,14 @@ msgstr "" msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "" -msgid "MergeRequests|Thread stays open" -msgstr "" +msgid "MergeRequests|Close the thread" +msgstr "Затвори темата" msgid "MergeRequests|Thread stays resolved" msgstr "" -msgid "MergeRequests|Thread will be open" -msgstr "" +msgid "MergeRequests|Reopen the thread" +msgstr "Отвори отново темата" msgid "MergeRequests|Thread will be resolved" msgstr "" diff --git a/locale/cs_CZ/gitlab.po b/locale/cs_CZ/gitlab.po index eb0c9feee9bf1d..45ec81d5104980 100644 --- a/locale/cs_CZ/gitlab.po +++ b/locale/cs_CZ/gitlab.po @@ -41275,14 +41275,14 @@ msgstr "" msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "" -msgid "MergeRequests|Thread stays open" -msgstr "" +msgid "MergeRequests|Close the thread" +msgstr "Zavřít vlákno" msgid "MergeRequests|Thread stays resolved" msgstr "" -msgid "MergeRequests|Thread will be open" -msgstr "" +msgid "MergeRequests|Reopen the thread" +msgstr "Znovu otevřít vlákno" msgid "MergeRequests|Thread will be resolved" msgstr "" diff --git a/locale/da_DK/gitlab.po b/locale/da_DK/gitlab.po index c73bfcd9784724..1e2b8984bd29ea 100644 --- a/locale/da_DK/gitlab.po +++ b/locale/da_DK/gitlab.po @@ -40669,14 +40669,14 @@ msgstr "" msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "" -msgid "MergeRequests|Thread stays open" -msgstr "" +msgid "MergeRequests|Close the thread" +msgstr "Luk tråden" msgid "MergeRequests|Thread stays resolved" msgstr "Tråd forbliver løst" -msgid "MergeRequests|Thread will be open" -msgstr "" +msgid "MergeRequests|Reopen the thread" +msgstr "Genåbn tråden" msgid "MergeRequests|Thread will be resolved" msgstr "Tråd vil forblive løst" diff --git a/locale/de/gitlab.po b/locale/de/gitlab.po index aa091cb6df5916..d3995670a9a14d 100644 --- a/locale/de/gitlab.po +++ b/locale/de/gitlab.po @@ -40669,14 +40669,14 @@ msgstr "Squashing fehlgeschlagen: Squashe die Commits lokal, löse alle Konflikt msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "Squashen nicht erlaubt: Dieses Projekt erlaubt es dir nicht, Commits bei der Zusammenführung zu squashen." -msgid "MergeRequests|Thread stays open" -msgstr "Thread bleibt offen" +msgid "MergeRequests|Close the thread" +msgstr "Schließe den Thread" msgid "MergeRequests|Thread stays resolved" msgstr "Thread bleibt beendet" -msgid "MergeRequests|Thread will be open" -msgstr "Thread wird geöffnet" +msgid "MergeRequests|Reopen the thread" +msgstr "Öffne den Thread erneut" msgid "MergeRequests|Thread will be resolved" msgstr "Diskussion wird beendet" diff --git a/locale/eo/gitlab.po b/locale/eo/gitlab.po index 7bbbbeae787422..16987610a3c806 100644 --- a/locale/eo/gitlab.po +++ b/locale/eo/gitlab.po @@ -40669,14 +40669,14 @@ msgstr "" msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "" -msgid "MergeRequests|Thread stays open" -msgstr "" +msgid "MergeRequests|Close the thread" +msgstr "Fermu la fadenon" msgid "MergeRequests|Thread stays resolved" msgstr "" -msgid "MergeRequests|Thread will be open" -msgstr "" +msgid "MergeRequests|Reopen the thread" +msgstr "Remalfermu la fadenon" msgid "MergeRequests|Thread will be resolved" msgstr "" diff --git a/locale/es/gitlab.po b/locale/es/gitlab.po index 2886afba11acaf..4344d3f39b5865 100644 --- a/locale/es/gitlab.po +++ b/locale/es/gitlab.po @@ -40669,14 +40669,14 @@ msgstr "" msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "" -msgid "MergeRequests|Thread stays open" -msgstr "El hilo permanece abierto" +msgid "MergeRequests|Close the thread" +msgstr "cerrar el hilo" msgid "MergeRequests|Thread stays resolved" msgstr "El hilo permanece resuelto" -msgid "MergeRequests|Thread will be open" -msgstr "El hilo se abrirá" +msgid "MergeRequests|Reopen the thread" +msgstr "Reabrir el hilo" msgid "MergeRequests|Thread will be resolved" msgstr "El hilo se resolverá" diff --git a/locale/fil_PH/gitlab.po b/locale/fil_PH/gitlab.po index 64f568b0434977..60a98df3c29ad2 100644 --- a/locale/fil_PH/gitlab.po +++ b/locale/fil_PH/gitlab.po @@ -40669,14 +40669,14 @@ msgstr "" msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "" -msgid "MergeRequests|Thread stays open" -msgstr "" +msgid "MergeRequests|Close the thread" +msgstr "Isara ang thread" msgid "MergeRequests|Thread stays resolved" msgstr "" -msgid "MergeRequests|Thread will be open" -msgstr "" +msgid "MergeRequests|Reopen the thread" +msgstr "Buksan muli ang thread" msgid "MergeRequests|Thread will be resolved" msgstr "" diff --git a/locale/fr/gitlab.po b/locale/fr/gitlab.po index eb744d30879af0..0e9f2e8df519d2 100644 --- a/locale/fr/gitlab.po +++ b/locale/fr/gitlab.po @@ -40669,14 +40669,14 @@ msgstr "L'écrasement a échoué : Écrasez les validations en local, résolvez msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "Écrasement non autorisé : Ce projet ne vous autorise pas à écraser les validations lors de la fusion." -msgid "MergeRequests|Thread stays open" -msgstr "Le fil de conversation reste ouvert" +msgid "MergeRequests|Close the thread" +msgstr "Fermer le fil" msgid "MergeRequests|Thread stays resolved" msgstr "Le fil de conversation reste résolu" -msgid "MergeRequests|Thread will be open" -msgstr "Un fil de conversation va être ouvert" +msgid "MergeRequests|Reopen the thread" +msgstr "Rouvrez le fil" msgid "MergeRequests|Thread will be resolved" msgstr "Le fil de conversation sera résolu" diff --git a/locale/ga_IE/gitlab.po b/locale/ga_IE/gitlab.po index eb91cbc9d5987a..9f1b41d25c1c99 100644 --- a/locale/ga_IE/gitlab.po +++ b/locale/ga_IE/gitlab.po @@ -41578,14 +41578,14 @@ msgstr "Theip ar an scuaise: Scuais na geallta go háitiúil, réitigh aon choin msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "Ní cheadaítear scuaise: Ní cheadaíonn an tionscadal seo duit gealltanais a scuaise agus tú ag cumasc." -msgid "MergeRequests|Thread stays open" -msgstr "Fanann an snáithe oscailte" +msgid "MergeRequests|Close the thread" +msgstr "Dún an snáithe" msgid "MergeRequests|Thread stays resolved" msgstr "Fanann an snáithe réitithe" -msgid "MergeRequests|Thread will be open" -msgstr "Beidh an snáithe oscailte" +msgid "MergeRequests|Reopen the thread" +msgstr "Athoscail an snáithe" msgid "MergeRequests|Thread will be resolved" msgstr "Réiteofar an snáithe" diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 5d4b58097029e3..c774d756760207 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -41028,6 +41028,9 @@ msgstr "" msgid "MergeRequests|Can't perform this action automatically. It may have already been done, or a more recent commit may have updated some of this content. Please perform this action locally." msgstr "" +msgid "MergeRequests|Close the thread" +msgstr "" + msgid "MergeRequests|Comment could not be submitted: %{reason}." msgstr "" @@ -41061,6 +41064,9 @@ msgstr "" msgid "MergeRequests|Reference copied" msgstr "" +msgid "MergeRequests|Reopen the thread" +msgstr "" + msgid "MergeRequests|Requires that merge checks pass." msgstr "" @@ -41070,15 +41076,9 @@ msgstr "" msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "" -msgid "MergeRequests|Thread stays open" -msgstr "" - msgid "MergeRequests|Thread stays resolved" msgstr "" -msgid "MergeRequests|Thread will be open" -msgstr "" - msgid "MergeRequests|Thread will be resolved" msgstr "" diff --git a/locale/gl_ES/gitlab.po b/locale/gl_ES/gitlab.po index f427d66ced0ecf..47dd40e0a6c9be 100644 --- a/locale/gl_ES/gitlab.po +++ b/locale/gl_ES/gitlab.po @@ -40669,14 +40669,14 @@ msgstr "" msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "" -msgid "MergeRequests|Thread stays open" -msgstr "" +msgid "MergeRequests|Close the thread" +msgstr "Pechar o fío" msgid "MergeRequests|Thread stays resolved" msgstr "" -msgid "MergeRequests|Thread will be open" -msgstr "" +msgid "MergeRequests|Reopen the thread" +msgstr "Reabrir o fío" msgid "MergeRequests|Thread will be resolved" msgstr "" diff --git a/locale/id_ID/gitlab.po b/locale/id_ID/gitlab.po index cc57e951a36f90..2a64b2c4e83ab4 100644 --- a/locale/id_ID/gitlab.po +++ b/locale/id_ID/gitlab.po @@ -40366,14 +40366,14 @@ msgstr "" msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "" -msgid "MergeRequests|Thread stays open" -msgstr "" +msgid "MergeRequests|Close the thread" +msgstr "Tutup utasnya" msgid "MergeRequests|Thread stays resolved" msgstr "" -msgid "MergeRequests|Thread will be open" -msgstr "" +msgid "MergeRequests|Reopen the thread" +msgstr "Buka kembali utasnya" msgid "MergeRequests|Thread will be resolved" msgstr "" diff --git a/locale/it/gitlab.po b/locale/it/gitlab.po index 613a0e7b7e530b..555b7a197d3458 100644 --- a/locale/it/gitlab.po +++ b/locale/it/gitlab.po @@ -40669,14 +40669,14 @@ msgstr "Esecuzione dello squash non riuscita: esegui lo squash dei commit a live msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "Esecuzione dello squash non autorizzata: questo progetto non consente di eseguire lo squash dei commit durante il merge." -msgid "MergeRequests|Thread stays open" -msgstr "Il thread rimane aperto" +msgid "MergeRequests|Close the thread" +msgstr "Chiudi il thread" msgid "MergeRequests|Thread stays resolved" msgstr "I thread rimangono risolti" -msgid "MergeRequests|Thread will be open" -msgstr "Il thread sarà aperto" +msgid "MergeRequests|Reopen the thread" +msgstr "Riaprire il thread" msgid "MergeRequests|Thread will be resolved" msgstr "Il thread verrà risolto" diff --git a/locale/ja/gitlab.po b/locale/ja/gitlab.po index 02a41624155df7..3dfa60eae6f5eb 100644 --- a/locale/ja/gitlab.po +++ b/locale/ja/gitlab.po @@ -40366,14 +40366,14 @@ msgstr "スカッシュに失敗しました: コミットをローカルにス msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "スカッシュは許可されていません：このプロジェクトではマージの際にスカッシュはできません。" -msgid "MergeRequests|Thread stays open" -msgstr "スレッドはオープンのままです。" +msgid "MergeRequests|Close the thread" +msgstr "スレッドを閉じる" msgid "MergeRequests|Thread stays resolved" msgstr "スレッドは解決済みのままです" -msgid "MergeRequests|Thread will be open" -msgstr "" +msgid "MergeRequests|Reopen the thread" +msgstr "スレッドを再開する" msgid "MergeRequests|Thread will be resolved" msgstr "スレッドを解決します" diff --git a/locale/ko/gitlab.po b/locale/ko/gitlab.po index cafb3c3733e200..0f4df6a038de5b 100644 --- a/locale/ko/gitlab.po +++ b/locale/ko/gitlab.po @@ -40366,14 +40366,14 @@ msgstr "스쿼시 실패: 커밋을 로컬로 스쿼시하고, 충돌을 해결 msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "스쿼시 허용되지 않음: 이 프로젝트는 머지시 커밋 스쿼시를 허용하지 않습니다." -msgid "MergeRequests|Thread stays open" -msgstr "스레드가 열림 상태로 유지됨" +msgid "MergeRequests|Close the thread" +msgstr "스레드를 닫으세요" msgid "MergeRequests|Thread stays resolved" msgstr "스레드가 해결된 상태로 유지됨" -msgid "MergeRequests|Thread will be open" -msgstr "쓰레드가 열리게 됨" +msgid "MergeRequests|Reopen the thread" +msgstr "스레드를 다시 엽니다" msgid "MergeRequests|Thread will be resolved" msgstr "스레드가 해결될 것입니다" diff --git a/locale/nb_NO/gitlab.po b/locale/nb_NO/gitlab.po index f528b5e082dc40..007a10bec76c36 100644 --- a/locale/nb_NO/gitlab.po +++ b/locale/nb_NO/gitlab.po @@ -40669,14 +40669,14 @@ msgstr "" msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "" -msgid "MergeRequests|Thread stays open" -msgstr "" +msgid "MergeRequests|Close the thread" +msgstr "Lukk tråden" msgid "MergeRequests|Thread stays resolved" msgstr "Tråden forblir oppklart" -msgid "MergeRequests|Thread will be open" -msgstr "" +msgid "MergeRequests|Reopen the thread" +msgstr "Åpne tråden på nytt" msgid "MergeRequests|Thread will be resolved" msgstr "Tråden vil bli oppklart" diff --git a/locale/nl_NL/gitlab.po b/locale/nl_NL/gitlab.po index 40ef1fc2c07442..e80d22abb2dba0 100644 --- a/locale/nl_NL/gitlab.po +++ b/locale/nl_NL/gitlab.po @@ -40669,14 +40669,14 @@ msgstr "" msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "" -msgid "MergeRequests|Thread stays open" -msgstr "" +msgid "MergeRequests|Close the thread" +msgstr "Sluit de draad" msgid "MergeRequests|Thread stays resolved" msgstr "" -msgid "MergeRequests|Thread will be open" -msgstr "" +msgid "MergeRequests|Reopen the thread" +msgstr "Heropen de thread" msgid "MergeRequests|Thread will be resolved" msgstr "" diff --git a/locale/pl_PL/gitlab.po b/locale/pl_PL/gitlab.po index 326a106c1f35fe..851c2ec455d014 100644 --- a/locale/pl_PL/gitlab.po +++ b/locale/pl_PL/gitlab.po @@ -41275,14 +41275,14 @@ msgstr "" msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "" -msgid "MergeRequests|Thread stays open" -msgstr "" +msgid "MergeRequests|Close the thread" +msgstr "Zamknij wątek" msgid "MergeRequests|Thread stays resolved" msgstr "" -msgid "MergeRequests|Thread will be open" -msgstr "" +msgid "MergeRequests|Reopen the thread" +msgstr "Otwórz ponownie wątek" msgid "MergeRequests|Thread will be resolved" msgstr "" diff --git a/locale/pt_BR/gitlab.po b/locale/pt_BR/gitlab.po index 5cc2da83c5bced..ddf7f71398650f 100644 --- a/locale/pt_BR/gitlab.po +++ b/locale/pt_BR/gitlab.po @@ -40669,13 +40669,13 @@ msgstr "A execução do squash falhou: execute o squash dos commits localmente, msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "Squash não permitido: este projeto não permite que você execute o squash de commits durante o merge." -msgid "MergeRequests|Thread stays open" +msgid "MergeRequests|Close the thread" msgstr "O tópico permanece aberto" msgid "MergeRequests|Thread stays resolved" msgstr "O tópico permanece resolvido" -msgid "MergeRequests|Thread will be open" +msgid "MergeRequests|Reopen the thread" msgstr "O tópico será aberto" msgid "MergeRequests|Thread will be resolved" diff --git a/locale/ro_RO/gitlab.po b/locale/ro_RO/gitlab.po index 6c7ed8a417c233..e4835d548d8403 100644 --- a/locale/ro_RO/gitlab.po +++ b/locale/ro_RO/gitlab.po @@ -40972,14 +40972,14 @@ msgstr "Squashing-ul a eșuat: Faceți squash de commit-uri la nivel local, rezo msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "Squashing-ul nu este permis: Acest proiect nu vă permite să faceți squash de commit-uri la îmbinare." -msgid "MergeRequests|Thread stays open" -msgstr "" +msgid "MergeRequests|Close the thread" +msgstr "Închide firul de discuție" msgid "MergeRequests|Thread stays resolved" msgstr "Subiectul rămâne rezolvat" -msgid "MergeRequests|Thread will be open" -msgstr "" +msgid "MergeRequests|Reopen the thread" +msgstr "Redeschideți firul de discuție" msgid "MergeRequests|Thread will be resolved" msgstr "Subiectul va fi rezolvat" diff --git a/locale/ru/gitlab.po b/locale/ru/gitlab.po index 47170c28bb85ac..44c20c26fdf68b 100644 --- a/locale/ru/gitlab.po +++ b/locale/ru/gitlab.po @@ -41275,14 +41275,14 @@ msgstr "Сжатие не удалось: сожмите коммиты лока msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "Сжатие не разрешено: этот проект не позволяет вам сжимать коммиты при слиянии." -msgid "MergeRequests|Thread stays open" -msgstr "Тема останется открытой" +msgid "MergeRequests|Close the thread" +msgstr "Закрыть ветку" msgid "MergeRequests|Thread stays resolved" msgstr "" -msgid "MergeRequests|Thread will be open" -msgstr "Тема будет открыта" +msgid "MergeRequests|Reopen the thread" +msgstr "Переоткрыть ветку" msgid "MergeRequests|Thread will be resolved" msgstr "" diff --git a/locale/si_LK/gitlab.po b/locale/si_LK/gitlab.po index f756a532f5545b..3b274f2bdf7237 100644 --- a/locale/si_LK/gitlab.po +++ b/locale/si_LK/gitlab.po @@ -40669,14 +40669,14 @@ msgstr "" msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "" -msgid "MergeRequests|Thread stays open" -msgstr "" +msgid "MergeRequests|Close the thread" +msgstr "නූල වසන්න" msgid "MergeRequests|Thread stays resolved" msgstr "" -msgid "MergeRequests|Thread will be open" -msgstr "" +msgid "MergeRequests|Reopen the thread" +msgstr "නූල නැවත විවෘත කරන්න" msgid "MergeRequests|Thread will be resolved" msgstr "" diff --git a/locale/tr_TR/gitlab.po b/locale/tr_TR/gitlab.po index b2e2cb77199392..4b8be577cd1d0c 100644 --- a/locale/tr_TR/gitlab.po +++ b/locale/tr_TR/gitlab.po @@ -40669,14 +40669,14 @@ msgstr "" msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "" -msgid "MergeRequests|Thread stays open" -msgstr "" +msgid "MergeRequests|Close the thread" +msgstr "Konuyu kapat" msgid "MergeRequests|Thread stays resolved" msgstr "" -msgid "MergeRequests|Thread will be open" -msgstr "" +msgid "MergeRequests|Reopen the thread" +msgstr "Konuyu yeniden aç" msgid "MergeRequests|Thread will be resolved" msgstr "" diff --git a/locale/uk/gitlab.po b/locale/uk/gitlab.po index 794e8b65c4fff9..c27c7a88d6bc3c 100644 --- a/locale/uk/gitlab.po +++ b/locale/uk/gitlab.po @@ -41275,13 +41275,13 @@ msgstr "" msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "" -msgid "MergeRequests|Thread stays open" +msgid "MergeRequests|Close the thread" msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "Обговорення залишається закритим" -msgid "MergeRequests|Thread will be open" +msgid "MergeRequests|Reopen the thread" msgstr "" msgid "MergeRequests|Thread will be resolved" diff --git a/locale/zh_CN/gitlab.po b/locale/zh_CN/gitlab.po index 814d7a058b1cd7..eedf16ebab8262 100644 --- a/locale/zh_CN/gitlab.po +++ b/locale/zh_CN/gitlab.po @@ -40366,14 +40366,14 @@ msgstr "压缩失败：本地提交，解决任何存在的冲突，然后推送 msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "不允许压缩：此项目不允许您在合并时压缩提交。" -msgid "MergeRequests|Thread stays open" -msgstr "" +msgid "MergeRequests|Close the thread" +msgstr "关闭话题" msgid "MergeRequests|Thread stays resolved" msgstr "主题保持已解决状态" -msgid "MergeRequests|Thread will be open" -msgstr "" +msgid "MergeRequests|Reopen the thread" +msgstr "重新打开话题" msgid "MergeRequests|Thread will be resolved" msgstr "主题将置为解决状态" diff --git a/locale/zh_HK/gitlab.po b/locale/zh_HK/gitlab.po index 9047f7db2a6212..cb05351233b4c2 100644 --- a/locale/zh_HK/gitlab.po +++ b/locale/zh_HK/gitlab.po @@ -40366,14 +40366,14 @@ msgstr "" msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "" -msgid "MergeRequests|Thread stays open" -msgstr "" +msgid "MergeRequests|Close the thread" +msgstr "關閉話題" msgid "MergeRequests|Thread stays resolved" msgstr "" -msgid "MergeRequests|Thread will be open" -msgstr "" +msgid "MergeRequests|Reopen the thread" +msgstr "重新開啟話題" msgid "MergeRequests|Thread will be resolved" msgstr "" diff --git a/locale/zh_TW/gitlab.po b/locale/zh_TW/gitlab.po index 62b1c923103082..9feb22ea1d35c4 100644 --- a/locale/zh_TW/gitlab.po +++ b/locale/zh_TW/gitlab.po @@ -40366,14 +40366,14 @@ msgstr "壓縮 (Squash) 失敗：壓縮本地提交，解決任何存在的衝 msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "不允許壓縮 (Squash) : 此專案不允許您在合併時壓縮 (Squash) 提交。" -msgid "MergeRequests|Thread stays open" -msgstr "" +msgid "MergeRequests|Close the thread" +msgstr "關閉話題" msgid "MergeRequests|Thread stays resolved" msgstr "話題保持已解決狀態" -msgid "MergeRequests|Thread will be open" -msgstr "" +msgid "MergeRequests|Reopen the thread" +msgstr "重新開啟話題" msgid "MergeRequests|Thread will be resolved" msgstr "話題將置為解決狀態" diff --git a/spec/frontend/notes/components/note_actions_spec.js b/spec/frontend/notes/components/note_actions_spec.js index 140970c5714e3e..6c950abd2eada0 100644 --- a/spec/frontend/notes/components/note_actions_spec.js +++ b/spec/frontend/notes/components/note_actions_spec.js @@ -353,7 +353,7 @@ describe('noteActions', () => { const resolveButton = wrapper.findComponent({ ref: 'resolveButton' }); expect(resolveButton.exists()).toBe(true); - expect(resolveButton.attributes('title')).toBe('Thread stays open'); + expect(resolveButton.attributes('title')).toBe('Close the thread'); }); }); -- GitLab From ec76ade8b1bff708c8824a46f78c6493ef1f8043 Mon Sep 17 00:00:00 2001 From: therealrinku Date: Sat, 4 Oct 2025 14:28:03 +0545 Subject: [PATCH 2/8] fix: update translations --- locale/gl_ES/gitlab.po | 4 ++-- locale/pt_BR/gitlab.po | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/locale/gl_ES/gitlab.po b/locale/gl_ES/gitlab.po index 47dd40e0a6c9be..f74c5ec5a983de 100644 --- a/locale/gl_ES/gitlab.po +++ b/locale/gl_ES/gitlab.po @@ -40670,13 +40670,13 @@ msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to sq msgstr "" msgid "MergeRequests|Close the thread" -msgstr "Pechar o fío" +msgstr "Feche o tópico" msgid "MergeRequests|Thread stays resolved" msgstr "" msgid "MergeRequests|Reopen the thread" -msgstr "Reabrir o fío" +msgstr "Reabrir o tópico" msgid "MergeRequests|Thread will be resolved" msgstr "" diff --git a/locale/pt_BR/gitlab.po b/locale/pt_BR/gitlab.po index ddf7f71398650f..0aff47174ab20c 100644 --- a/locale/pt_BR/gitlab.po +++ b/locale/pt_BR/gitlab.po @@ -40670,13 +40670,13 @@ msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to sq msgstr "Squash não permitido: este projeto não permite que você execute o squash de commits durante o merge." msgid "MergeRequests|Close the thread" -msgstr "O tópico permanece aberto" +msgstr "Feche o tópico" msgid "MergeRequests|Thread stays resolved" msgstr "O tópico permanece resolvido" msgid "MergeRequests|Reopen the thread" -msgstr "O tópico será aberto" +msgstr "Reabrir o tópico" msgid "MergeRequests|Thread will be resolved" msgstr "O tópico será resolvido" -- GitLab From f9f0ac6a51123b44ed697b3ee077f565898ae512 Mon Sep 17 00:00:00 2001 From: therealrinku Date: Mon, 6 Oct 2025 16:55:18 +0545 Subject: [PATCH 3/8] chore: remove non-english translations --- locale/bg/gitlab.po | 4 ++-- locale/cs_CZ/gitlab.po | 4 ++-- locale/da_DK/gitlab.po | 4 ++-- locale/de/gitlab.po | 4 ++-- locale/eo/gitlab.po | 4 ++-- locale/es/gitlab.po | 4 ++-- locale/fil_PH/gitlab.po | 4 ++-- locale/fr/gitlab.po | 4 ++-- locale/ga_IE/gitlab.po | 4 ++-- locale/gl_ES/gitlab.po | 4 ++-- locale/id_ID/gitlab.po | 4 ++-- locale/it/gitlab.po | 4 ++-- locale/ja/gitlab.po | 4 ++-- locale/ko/gitlab.po | 4 ++-- locale/nb_NO/gitlab.po | 4 ++-- locale/nl_NL/gitlab.po | 4 ++-- locale/pl_PL/gitlab.po | 4 ++-- locale/pt_BR/gitlab.po | 4 ++-- locale/ro_RO/gitlab.po | 4 ++-- locale/ru/gitlab.po | 4 ++-- locale/si_LK/gitlab.po | 4 ++-- locale/tr_TR/gitlab.po | 4 ++-- locale/zh_CN/gitlab.po | 4 ++-- locale/zh_HK/gitlab.po | 4 ++-- locale/zh_TW/gitlab.po | 4 ++-- 25 files changed, 50 insertions(+), 50 deletions(-) diff --git a/locale/bg/gitlab.po b/locale/bg/gitlab.po index a826afc105045d..ef050b54ab458d 100644 --- a/locale/bg/gitlab.po +++ b/locale/bg/gitlab.po @@ -40670,13 +40670,13 @@ msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to sq msgstr "" msgid "MergeRequests|Close the thread" -msgstr "Затвори темата" +msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "" msgid "MergeRequests|Reopen the thread" -msgstr "Отвори отново темата" +msgstr "" msgid "MergeRequests|Thread will be resolved" msgstr "" diff --git a/locale/cs_CZ/gitlab.po b/locale/cs_CZ/gitlab.po index 45ec81d5104980..9df2190366cc84 100644 --- a/locale/cs_CZ/gitlab.po +++ b/locale/cs_CZ/gitlab.po @@ -41276,13 +41276,13 @@ msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to sq msgstr "" msgid "MergeRequests|Close the thread" -msgstr "Zavřít vlákno" +msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "" msgid "MergeRequests|Reopen the thread" -msgstr "Znovu otevřít vlákno" +msgstr "" msgid "MergeRequests|Thread will be resolved" msgstr "" diff --git a/locale/da_DK/gitlab.po b/locale/da_DK/gitlab.po index 1e2b8984bd29ea..f1d75fecd56b35 100644 --- a/locale/da_DK/gitlab.po +++ b/locale/da_DK/gitlab.po @@ -40670,13 +40670,13 @@ msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to sq msgstr "" msgid "MergeRequests|Close the thread" -msgstr "Luk tråden" +msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "Tråd forbliver løst" msgid "MergeRequests|Reopen the thread" -msgstr "Genåbn tråden" +msgstr "" msgid "MergeRequests|Thread will be resolved" msgstr "Tråd vil forblive løst" diff --git a/locale/de/gitlab.po b/locale/de/gitlab.po index d3995670a9a14d..329eda9d9f3034 100644 --- a/locale/de/gitlab.po +++ b/locale/de/gitlab.po @@ -40670,13 +40670,13 @@ msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to sq msgstr "Squashen nicht erlaubt: Dieses Projekt erlaubt es dir nicht, Commits bei der Zusammenführung zu squashen." msgid "MergeRequests|Close the thread" -msgstr "Schließe den Thread" +msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "Thread bleibt beendet" msgid "MergeRequests|Reopen the thread" -msgstr "Öffne den Thread erneut" +msgstr "" msgid "MergeRequests|Thread will be resolved" msgstr "Diskussion wird beendet" diff --git a/locale/eo/gitlab.po b/locale/eo/gitlab.po index 16987610a3c806..4e18b601adf4e8 100644 --- a/locale/eo/gitlab.po +++ b/locale/eo/gitlab.po @@ -40670,13 +40670,13 @@ msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to sq msgstr "" msgid "MergeRequests|Close the thread" -msgstr "Fermu la fadenon" +msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "" msgid "MergeRequests|Reopen the thread" -msgstr "Remalfermu la fadenon" +msgstr "" msgid "MergeRequests|Thread will be resolved" msgstr "" diff --git a/locale/es/gitlab.po b/locale/es/gitlab.po index 4344d3f39b5865..2b68645e6f1040 100644 --- a/locale/es/gitlab.po +++ b/locale/es/gitlab.po @@ -40670,13 +40670,13 @@ msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to sq msgstr "" msgid "MergeRequests|Close the thread" -msgstr "cerrar el hilo" +msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "El hilo permanece resuelto" msgid "MergeRequests|Reopen the thread" -msgstr "Reabrir el hilo" +msgstr "" msgid "MergeRequests|Thread will be resolved" msgstr "El hilo se resolverá" diff --git a/locale/fil_PH/gitlab.po b/locale/fil_PH/gitlab.po index 60a98df3c29ad2..5d95c2c4b04bc9 100644 --- a/locale/fil_PH/gitlab.po +++ b/locale/fil_PH/gitlab.po @@ -40670,13 +40670,13 @@ msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to sq msgstr "" msgid "MergeRequests|Close the thread" -msgstr "Isara ang thread" +msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "" msgid "MergeRequests|Reopen the thread" -msgstr "Buksan muli ang thread" +msgstr "" msgid "MergeRequests|Thread will be resolved" msgstr "" diff --git a/locale/fr/gitlab.po b/locale/fr/gitlab.po index 0e9f2e8df519d2..901e69bee34325 100644 --- a/locale/fr/gitlab.po +++ b/locale/fr/gitlab.po @@ -40670,13 +40670,13 @@ msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to sq msgstr "Écrasement non autorisé : Ce projet ne vous autorise pas à écraser les validations lors de la fusion." msgid "MergeRequests|Close the thread" -msgstr "Fermer le fil" +msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "Le fil de conversation reste résolu" msgid "MergeRequests|Reopen the thread" -msgstr "Rouvrez le fil" +msgstr "" msgid "MergeRequests|Thread will be resolved" msgstr "Le fil de conversation sera résolu" diff --git a/locale/ga_IE/gitlab.po b/locale/ga_IE/gitlab.po index 9f1b41d25c1c99..8d1026e59147e2 100644 --- a/locale/ga_IE/gitlab.po +++ b/locale/ga_IE/gitlab.po @@ -41579,13 +41579,13 @@ msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to sq msgstr "Ní cheadaítear scuaise: Ní cheadaíonn an tionscadal seo duit gealltanais a scuaise agus tú ag cumasc." msgid "MergeRequests|Close the thread" -msgstr "Dún an snáithe" +msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "Fanann an snáithe réitithe" msgid "MergeRequests|Reopen the thread" -msgstr "Athoscail an snáithe" +msgstr "" msgid "MergeRequests|Thread will be resolved" msgstr "Réiteofar an snáithe" diff --git a/locale/gl_ES/gitlab.po b/locale/gl_ES/gitlab.po index f74c5ec5a983de..0387262e40d072 100644 --- a/locale/gl_ES/gitlab.po +++ b/locale/gl_ES/gitlab.po @@ -40670,13 +40670,13 @@ msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to sq msgstr "" msgid "MergeRequests|Close the thread" -msgstr "Feche o tópico" +msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "" msgid "MergeRequests|Reopen the thread" -msgstr "Reabrir o tópico" +msgstr "" msgid "MergeRequests|Thread will be resolved" msgstr "" diff --git a/locale/id_ID/gitlab.po b/locale/id_ID/gitlab.po index 2a64b2c4e83ab4..e1ef5d6f4ffdef 100644 --- a/locale/id_ID/gitlab.po +++ b/locale/id_ID/gitlab.po @@ -40367,13 +40367,13 @@ msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to sq msgstr "" msgid "MergeRequests|Close the thread" -msgstr "Tutup utasnya" +msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "" msgid "MergeRequests|Reopen the thread" -msgstr "Buka kembali utasnya" +msgstr "" msgid "MergeRequests|Thread will be resolved" msgstr "" diff --git a/locale/it/gitlab.po b/locale/it/gitlab.po index 555b7a197d3458..894ff3f8cdbc7b 100644 --- a/locale/it/gitlab.po +++ b/locale/it/gitlab.po @@ -40670,13 +40670,13 @@ msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to sq msgstr "Esecuzione dello squash non autorizzata: questo progetto non consente di eseguire lo squash dei commit durante il merge." msgid "MergeRequests|Close the thread" -msgstr "Chiudi il thread" +msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "I thread rimangono risolti" msgid "MergeRequests|Reopen the thread" -msgstr "Riaprire il thread" +msgstr "" msgid "MergeRequests|Thread will be resolved" msgstr "Il thread verrà risolto" diff --git a/locale/ja/gitlab.po b/locale/ja/gitlab.po index 3dfa60eae6f5eb..717d80db95bec6 100644 --- a/locale/ja/gitlab.po +++ b/locale/ja/gitlab.po @@ -40367,13 +40367,13 @@ msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to sq msgstr "スカッシュは許可されていません：このプロジェクトではマージの際にスカッシュはできません。" msgid "MergeRequests|Close the thread" -msgstr "スレッドを閉じる" +msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "スレッドは解決済みのままです" msgid "MergeRequests|Reopen the thread" -msgstr "スレッドを再開する" +msgstr "" msgid "MergeRequests|Thread will be resolved" msgstr "スレッドを解決します" diff --git a/locale/ko/gitlab.po b/locale/ko/gitlab.po index 0f4df6a038de5b..657ce857607923 100644 --- a/locale/ko/gitlab.po +++ b/locale/ko/gitlab.po @@ -40367,13 +40367,13 @@ msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to sq msgstr "스쿼시 허용되지 않음: 이 프로젝트는 머지시 커밋 스쿼시를 허용하지 않습니다." msgid "MergeRequests|Close the thread" -msgstr "스레드를 닫으세요" +msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "스레드가 해결된 상태로 유지됨" msgid "MergeRequests|Reopen the thread" -msgstr "스레드를 다시 엽니다" +msgstr "" msgid "MergeRequests|Thread will be resolved" msgstr "스레드가 해결될 것입니다" diff --git a/locale/nb_NO/gitlab.po b/locale/nb_NO/gitlab.po index 007a10bec76c36..b31e3d49772345 100644 --- a/locale/nb_NO/gitlab.po +++ b/locale/nb_NO/gitlab.po @@ -40670,13 +40670,13 @@ msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to sq msgstr "" msgid "MergeRequests|Close the thread" -msgstr "Lukk tråden" +msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "Tråden forblir oppklart" msgid "MergeRequests|Reopen the thread" -msgstr "Åpne tråden på nytt" +msgstr "" msgid "MergeRequests|Thread will be resolved" msgstr "Tråden vil bli oppklart" diff --git a/locale/nl_NL/gitlab.po b/locale/nl_NL/gitlab.po index e80d22abb2dba0..42d6fbdeebd1a3 100644 --- a/locale/nl_NL/gitlab.po +++ b/locale/nl_NL/gitlab.po @@ -40670,13 +40670,13 @@ msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to sq msgstr "" msgid "MergeRequests|Close the thread" -msgstr "Sluit de draad" +msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "" msgid "MergeRequests|Reopen the thread" -msgstr "Heropen de thread" +msgstr "" msgid "MergeRequests|Thread will be resolved" msgstr "" diff --git a/locale/pl_PL/gitlab.po b/locale/pl_PL/gitlab.po index 851c2ec455d014..19221c5941d141 100644 --- a/locale/pl_PL/gitlab.po +++ b/locale/pl_PL/gitlab.po @@ -41276,13 +41276,13 @@ msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to sq msgstr "" msgid "MergeRequests|Close the thread" -msgstr "Zamknij wątek" +msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "" msgid "MergeRequests|Reopen the thread" -msgstr "Otwórz ponownie wątek" +msgstr "" msgid "MergeRequests|Thread will be resolved" msgstr "" diff --git a/locale/pt_BR/gitlab.po b/locale/pt_BR/gitlab.po index 0aff47174ab20c..a72dda04906589 100644 --- a/locale/pt_BR/gitlab.po +++ b/locale/pt_BR/gitlab.po @@ -40670,13 +40670,13 @@ msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to sq msgstr "Squash não permitido: este projeto não permite que você execute o squash de commits durante o merge." msgid "MergeRequests|Close the thread" -msgstr "Feche o tópico" +msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "O tópico permanece resolvido" msgid "MergeRequests|Reopen the thread" -msgstr "Reabrir o tópico" +msgstr "" msgid "MergeRequests|Thread will be resolved" msgstr "O tópico será resolvido" diff --git a/locale/ro_RO/gitlab.po b/locale/ro_RO/gitlab.po index e4835d548d8403..809b97289f4584 100644 --- a/locale/ro_RO/gitlab.po +++ b/locale/ro_RO/gitlab.po @@ -40973,13 +40973,13 @@ msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to sq msgstr "Squashing-ul nu este permis: Acest proiect nu vă permite să faceți squash de commit-uri la îmbinare." msgid "MergeRequests|Close the thread" -msgstr "Închide firul de discuție" +msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "Subiectul rămâne rezolvat" msgid "MergeRequests|Reopen the thread" -msgstr "Redeschideți firul de discuție" +msgstr "" msgid "MergeRequests|Thread will be resolved" msgstr "Subiectul va fi rezolvat" diff --git a/locale/ru/gitlab.po b/locale/ru/gitlab.po index 44c20c26fdf68b..8ae2fb918b145a 100644 --- a/locale/ru/gitlab.po +++ b/locale/ru/gitlab.po @@ -41276,13 +41276,13 @@ msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to sq msgstr "Сжатие не разрешено: этот проект не позволяет вам сжимать коммиты при слиянии." msgid "MergeRequests|Close the thread" -msgstr "Закрыть ветку" +msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "" msgid "MergeRequests|Reopen the thread" -msgstr "Переоткрыть ветку" +msgstr "" msgid "MergeRequests|Thread will be resolved" msgstr "" diff --git a/locale/si_LK/gitlab.po b/locale/si_LK/gitlab.po index 3b274f2bdf7237..993db4c763832f 100644 --- a/locale/si_LK/gitlab.po +++ b/locale/si_LK/gitlab.po @@ -40670,13 +40670,13 @@ msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to sq msgstr "" msgid "MergeRequests|Close the thread" -msgstr "නූල වසන්න" +msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "" msgid "MergeRequests|Reopen the thread" -msgstr "නූල නැවත විවෘත කරන්න" +msgstr "" msgid "MergeRequests|Thread will be resolved" msgstr "" diff --git a/locale/tr_TR/gitlab.po b/locale/tr_TR/gitlab.po index 4b8be577cd1d0c..43ea92c244327c 100644 --- a/locale/tr_TR/gitlab.po +++ b/locale/tr_TR/gitlab.po @@ -40670,13 +40670,13 @@ msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to sq msgstr "" msgid "MergeRequests|Close the thread" -msgstr "Konuyu kapat" +msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "" msgid "MergeRequests|Reopen the thread" -msgstr "Konuyu yeniden aç" +msgstr "" msgid "MergeRequests|Thread will be resolved" msgstr "" diff --git a/locale/zh_CN/gitlab.po b/locale/zh_CN/gitlab.po index eedf16ebab8262..d899d5dfd332d1 100644 --- a/locale/zh_CN/gitlab.po +++ b/locale/zh_CN/gitlab.po @@ -40367,13 +40367,13 @@ msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to sq msgstr "不允许压缩：此项目不允许您在合并时压缩提交。" msgid "MergeRequests|Close the thread" -msgstr "关闭话题" +msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "主题保持已解决状态" msgid "MergeRequests|Reopen the thread" -msgstr "重新打开话题" +msgstr "" msgid "MergeRequests|Thread will be resolved" msgstr "主题将置为解决状态" diff --git a/locale/zh_HK/gitlab.po b/locale/zh_HK/gitlab.po index cb05351233b4c2..952a2378e65a74 100644 --- a/locale/zh_HK/gitlab.po +++ b/locale/zh_HK/gitlab.po @@ -40367,13 +40367,13 @@ msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to sq msgstr "" msgid "MergeRequests|Close the thread" -msgstr "關閉話題" +msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "" msgid "MergeRequests|Reopen the thread" -msgstr "重新開啟話題" +msgstr "" msgid "MergeRequests|Thread will be resolved" msgstr "" diff --git a/locale/zh_TW/gitlab.po b/locale/zh_TW/gitlab.po index 9feb22ea1d35c4..e118b6ecd87f64 100644 --- a/locale/zh_TW/gitlab.po +++ b/locale/zh_TW/gitlab.po @@ -40367,13 +40367,13 @@ msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to sq msgstr "不允許壓縮 (Squash) : 此專案不允許您在合併時壓縮 (Squash) 提交。" msgid "MergeRequests|Close the thread" -msgstr "關閉話題" +msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "話題保持已解決狀態" msgid "MergeRequests|Reopen the thread" -msgstr "重新開啟話題" +msgstr "" msgid "MergeRequests|Thread will be resolved" msgstr "話題將置為解決狀態" -- GitLab From 190f44f387b9fee0b46de5f1b807aa2945d3d9b1 Mon Sep 17 00:00:00 2001 From: therealrinku Date: Mon, 6 Oct 2025 17:36:03 +0545 Subject: [PATCH 4/8] chore: remove translation file changes --- locale/bg/gitlab.po | 4 ++-- locale/cs_CZ/gitlab.po | 4 ++-- locale/da_DK/gitlab.po | 4 ++-- locale/de/gitlab.po | 4 ++-- locale/eo/gitlab.po | 4 ++-- locale/es/gitlab.po | 8 ++++---- locale/fil_PH/gitlab.po | 4 ++-- locale/fr/gitlab.po | 8 ++++---- locale/ga_IE/gitlab.po | 8 ++++---- locale/gl_ES/gitlab.po | 4 ++-- locale/id_ID/gitlab.po | 4 ++-- locale/it/gitlab.po | 8 ++++---- locale/ja/gitlab.po | 6 +++--- locale/ko/gitlab.po | 8 ++++---- locale/nb_NO/gitlab.po | 4 ++-- locale/nl_NL/gitlab.po | 4 ++-- locale/pl_PL/gitlab.po | 4 ++-- locale/pt_BR/gitlab.po | 8 ++++---- locale/ro_RO/gitlab.po | 4 ++-- locale/ru/gitlab.po | 8 ++++---- locale/si_LK/gitlab.po | 4 ++-- locale/tr_TR/gitlab.po | 4 ++-- locale/uk/gitlab.po | 4 ++-- locale/zh_CN/gitlab.po | 4 ++-- locale/zh_HK/gitlab.po | 4 ++-- locale/zh_TW/gitlab.po | 4 ++-- 26 files changed, 67 insertions(+), 67 deletions(-) diff --git a/locale/bg/gitlab.po b/locale/bg/gitlab.po index ef050b54ab458d..4adf787d9fb6bc 100644 --- a/locale/bg/gitlab.po +++ b/locale/bg/gitlab.po @@ -40669,13 +40669,13 @@ msgstr "" msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "" -msgid "MergeRequests|Close the thread" +msgid "MergeRequests|Thread stays open" msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "" -msgid "MergeRequests|Reopen the thread" +msgid "MergeRequests|Thread will be open" msgstr "" msgid "MergeRequests|Thread will be resolved" diff --git a/locale/cs_CZ/gitlab.po b/locale/cs_CZ/gitlab.po index 9df2190366cc84..eb0c9feee9bf1d 100644 --- a/locale/cs_CZ/gitlab.po +++ b/locale/cs_CZ/gitlab.po @@ -41275,13 +41275,13 @@ msgstr "" msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "" -msgid "MergeRequests|Close the thread" +msgid "MergeRequests|Thread stays open" msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "" -msgid "MergeRequests|Reopen the thread" +msgid "MergeRequests|Thread will be open" msgstr "" msgid "MergeRequests|Thread will be resolved" diff --git a/locale/da_DK/gitlab.po b/locale/da_DK/gitlab.po index f1d75fecd56b35..c73bfcd9784724 100644 --- a/locale/da_DK/gitlab.po +++ b/locale/da_DK/gitlab.po @@ -40669,13 +40669,13 @@ msgstr "" msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "" -msgid "MergeRequests|Close the thread" +msgid "MergeRequests|Thread stays open" msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "Tråd forbliver løst" -msgid "MergeRequests|Reopen the thread" +msgid "MergeRequests|Thread will be open" msgstr "" msgid "MergeRequests|Thread will be resolved" diff --git a/locale/de/gitlab.po b/locale/de/gitlab.po index 329eda9d9f3034..3af18824fdaca8 100644 --- a/locale/de/gitlab.po +++ b/locale/de/gitlab.po @@ -40669,13 +40669,13 @@ msgstr "Squashing fehlgeschlagen: Squashe die Commits lokal, löse alle Konflikt msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "Squashen nicht erlaubt: Dieses Projekt erlaubt es dir nicht, Commits bei der Zusammenführung zu squashen." -msgid "MergeRequests|Close the thread" +msgid "MergeRequests|Thread stays open" msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "Thread bleibt beendet" -msgid "MergeRequests|Reopen the thread" +msgid "MergeRequests|Thread will be open" msgstr "" msgid "MergeRequests|Thread will be resolved" diff --git a/locale/eo/gitlab.po b/locale/eo/gitlab.po index 4e18b601adf4e8..7bbbbeae787422 100644 --- a/locale/eo/gitlab.po +++ b/locale/eo/gitlab.po @@ -40669,13 +40669,13 @@ msgstr "" msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "" -msgid "MergeRequests|Close the thread" +msgid "MergeRequests|Thread stays open" msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "" -msgid "MergeRequests|Reopen the thread" +msgid "MergeRequests|Thread will be open" msgstr "" msgid "MergeRequests|Thread will be resolved" diff --git a/locale/es/gitlab.po b/locale/es/gitlab.po index 2b68645e6f1040..2886afba11acaf 100644 --- a/locale/es/gitlab.po +++ b/locale/es/gitlab.po @@ -40669,14 +40669,14 @@ msgstr "" msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "" -msgid "MergeRequests|Close the thread" -msgstr "" +msgid "MergeRequests|Thread stays open" +msgstr "El hilo permanece abierto" msgid "MergeRequests|Thread stays resolved" msgstr "El hilo permanece resuelto" -msgid "MergeRequests|Reopen the thread" -msgstr "" +msgid "MergeRequests|Thread will be open" +msgstr "El hilo se abrirá" msgid "MergeRequests|Thread will be resolved" msgstr "El hilo se resolverá" diff --git a/locale/fil_PH/gitlab.po b/locale/fil_PH/gitlab.po index 5d95c2c4b04bc9..64f568b0434977 100644 --- a/locale/fil_PH/gitlab.po +++ b/locale/fil_PH/gitlab.po @@ -40669,13 +40669,13 @@ msgstr "" msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "" -msgid "MergeRequests|Close the thread" +msgid "MergeRequests|Thread stays open" msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "" -msgid "MergeRequests|Reopen the thread" +msgid "MergeRequests|Thread will be open" msgstr "" msgid "MergeRequests|Thread will be resolved" diff --git a/locale/fr/gitlab.po b/locale/fr/gitlab.po index 901e69bee34325..eb744d30879af0 100644 --- a/locale/fr/gitlab.po +++ b/locale/fr/gitlab.po @@ -40669,14 +40669,14 @@ msgstr "L'écrasement a échoué : Écrasez les validations en local, résolvez msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "Écrasement non autorisé : Ce projet ne vous autorise pas à écraser les validations lors de la fusion." -msgid "MergeRequests|Close the thread" -msgstr "" +msgid "MergeRequests|Thread stays open" +msgstr "Le fil de conversation reste ouvert" msgid "MergeRequests|Thread stays resolved" msgstr "Le fil de conversation reste résolu" -msgid "MergeRequests|Reopen the thread" -msgstr "" +msgid "MergeRequests|Thread will be open" +msgstr "Un fil de conversation va être ouvert" msgid "MergeRequests|Thread will be resolved" msgstr "Le fil de conversation sera résolu" diff --git a/locale/ga_IE/gitlab.po b/locale/ga_IE/gitlab.po index 8d1026e59147e2..eb91cbc9d5987a 100644 --- a/locale/ga_IE/gitlab.po +++ b/locale/ga_IE/gitlab.po @@ -41578,14 +41578,14 @@ msgstr "Theip ar an scuaise: Scuais na geallta go háitiúil, réitigh aon choin msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "Ní cheadaítear scuaise: Ní cheadaíonn an tionscadal seo duit gealltanais a scuaise agus tú ag cumasc." -msgid "MergeRequests|Close the thread" -msgstr "" +msgid "MergeRequests|Thread stays open" +msgstr "Fanann an snáithe oscailte" msgid "MergeRequests|Thread stays resolved" msgstr "Fanann an snáithe réitithe" -msgid "MergeRequests|Reopen the thread" -msgstr "" +msgid "MergeRequests|Thread will be open" +msgstr "Beidh an snáithe oscailte" msgid "MergeRequests|Thread will be resolved" msgstr "Réiteofar an snáithe" diff --git a/locale/gl_ES/gitlab.po b/locale/gl_ES/gitlab.po index 0387262e40d072..f427d66ced0ecf 100644 --- a/locale/gl_ES/gitlab.po +++ b/locale/gl_ES/gitlab.po @@ -40669,13 +40669,13 @@ msgstr "" msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "" -msgid "MergeRequests|Close the thread" +msgid "MergeRequests|Thread stays open" msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "" -msgid "MergeRequests|Reopen the thread" +msgid "MergeRequests|Thread will be open" msgstr "" msgid "MergeRequests|Thread will be resolved" diff --git a/locale/id_ID/gitlab.po b/locale/id_ID/gitlab.po index e1ef5d6f4ffdef..cc57e951a36f90 100644 --- a/locale/id_ID/gitlab.po +++ b/locale/id_ID/gitlab.po @@ -40366,13 +40366,13 @@ msgstr "" msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "" -msgid "MergeRequests|Close the thread" +msgid "MergeRequests|Thread stays open" msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "" -msgid "MergeRequests|Reopen the thread" +msgid "MergeRequests|Thread will be open" msgstr "" msgid "MergeRequests|Thread will be resolved" diff --git a/locale/it/gitlab.po b/locale/it/gitlab.po index 894ff3f8cdbc7b..613a0e7b7e530b 100644 --- a/locale/it/gitlab.po +++ b/locale/it/gitlab.po @@ -40669,14 +40669,14 @@ msgstr "Esecuzione dello squash non riuscita: esegui lo squash dei commit a live msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "Esecuzione dello squash non autorizzata: questo progetto non consente di eseguire lo squash dei commit durante il merge." -msgid "MergeRequests|Close the thread" -msgstr "" +msgid "MergeRequests|Thread stays open" +msgstr "Il thread rimane aperto" msgid "MergeRequests|Thread stays resolved" msgstr "I thread rimangono risolti" -msgid "MergeRequests|Reopen the thread" -msgstr "" +msgid "MergeRequests|Thread will be open" +msgstr "Il thread sarà aperto" msgid "MergeRequests|Thread will be resolved" msgstr "Il thread verrà risolto" diff --git a/locale/ja/gitlab.po b/locale/ja/gitlab.po index 717d80db95bec6..02a41624155df7 100644 --- a/locale/ja/gitlab.po +++ b/locale/ja/gitlab.po @@ -40366,13 +40366,13 @@ msgstr "スカッシュに失敗しました: コミットをローカルにス msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "スカッシュは許可されていません：このプロジェクトではマージの際にスカッシュはできません。" -msgid "MergeRequests|Close the thread" -msgstr "" +msgid "MergeRequests|Thread stays open" +msgstr "スレッドはオープンのままです。" msgid "MergeRequests|Thread stays resolved" msgstr "スレッドは解決済みのままです" -msgid "MergeRequests|Reopen the thread" +msgid "MergeRequests|Thread will be open" msgstr "" msgid "MergeRequests|Thread will be resolved" diff --git a/locale/ko/gitlab.po b/locale/ko/gitlab.po index 657ce857607923..cafb3c3733e200 100644 --- a/locale/ko/gitlab.po +++ b/locale/ko/gitlab.po @@ -40366,14 +40366,14 @@ msgstr "스쿼시 실패: 커밋을 로컬로 스쿼시하고, 충돌을 해결 msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "스쿼시 허용되지 않음: 이 프로젝트는 머지시 커밋 스쿼시를 허용하지 않습니다." -msgid "MergeRequests|Close the thread" -msgstr "" +msgid "MergeRequests|Thread stays open" +msgstr "스레드가 열림 상태로 유지됨" msgid "MergeRequests|Thread stays resolved" msgstr "스레드가 해결된 상태로 유지됨" -msgid "MergeRequests|Reopen the thread" -msgstr "" +msgid "MergeRequests|Thread will be open" +msgstr "쓰레드가 열리게 됨" msgid "MergeRequests|Thread will be resolved" msgstr "스레드가 해결될 것입니다" diff --git a/locale/nb_NO/gitlab.po b/locale/nb_NO/gitlab.po index b31e3d49772345..f528b5e082dc40 100644 --- a/locale/nb_NO/gitlab.po +++ b/locale/nb_NO/gitlab.po @@ -40669,13 +40669,13 @@ msgstr "" msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "" -msgid "MergeRequests|Close the thread" +msgid "MergeRequests|Thread stays open" msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "Tråden forblir oppklart" -msgid "MergeRequests|Reopen the thread" +msgid "MergeRequests|Thread will be open" msgstr "" msgid "MergeRequests|Thread will be resolved" diff --git a/locale/nl_NL/gitlab.po b/locale/nl_NL/gitlab.po index 42d6fbdeebd1a3..40ef1fc2c07442 100644 --- a/locale/nl_NL/gitlab.po +++ b/locale/nl_NL/gitlab.po @@ -40669,13 +40669,13 @@ msgstr "" msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "" -msgid "MergeRequests|Close the thread" +msgid "MergeRequests|Thread stays open" msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "" -msgid "MergeRequests|Reopen the thread" +msgid "MergeRequests|Thread will be open" msgstr "" msgid "MergeRequests|Thread will be resolved" diff --git a/locale/pl_PL/gitlab.po b/locale/pl_PL/gitlab.po index 19221c5941d141..326a106c1f35fe 100644 --- a/locale/pl_PL/gitlab.po +++ b/locale/pl_PL/gitlab.po @@ -41275,13 +41275,13 @@ msgstr "" msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "" -msgid "MergeRequests|Close the thread" +msgid "MergeRequests|Thread stays open" msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "" -msgid "MergeRequests|Reopen the thread" +msgid "MergeRequests|Thread will be open" msgstr "" msgid "MergeRequests|Thread will be resolved" diff --git a/locale/pt_BR/gitlab.po b/locale/pt_BR/gitlab.po index a72dda04906589..5cc2da83c5bced 100644 --- a/locale/pt_BR/gitlab.po +++ b/locale/pt_BR/gitlab.po @@ -40669,14 +40669,14 @@ msgstr "A execução do squash falhou: execute o squash dos commits localmente, msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "Squash não permitido: este projeto não permite que você execute o squash de commits durante o merge." -msgid "MergeRequests|Close the thread" -msgstr "" +msgid "MergeRequests|Thread stays open" +msgstr "O tópico permanece aberto" msgid "MergeRequests|Thread stays resolved" msgstr "O tópico permanece resolvido" -msgid "MergeRequests|Reopen the thread" -msgstr "" +msgid "MergeRequests|Thread will be open" +msgstr "O tópico será aberto" msgid "MergeRequests|Thread will be resolved" msgstr "O tópico será resolvido" diff --git a/locale/ro_RO/gitlab.po b/locale/ro_RO/gitlab.po index 809b97289f4584..6c7ed8a417c233 100644 --- a/locale/ro_RO/gitlab.po +++ b/locale/ro_RO/gitlab.po @@ -40972,13 +40972,13 @@ msgstr "Squashing-ul a eșuat: Faceți squash de commit-uri la nivel local, rezo msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "Squashing-ul nu este permis: Acest proiect nu vă permite să faceți squash de commit-uri la îmbinare." -msgid "MergeRequests|Close the thread" +msgid "MergeRequests|Thread stays open" msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "Subiectul rămâne rezolvat" -msgid "MergeRequests|Reopen the thread" +msgid "MergeRequests|Thread will be open" msgstr "" msgid "MergeRequests|Thread will be resolved" diff --git a/locale/ru/gitlab.po b/locale/ru/gitlab.po index 8ae2fb918b145a..47170c28bb85ac 100644 --- a/locale/ru/gitlab.po +++ b/locale/ru/gitlab.po @@ -41275,14 +41275,14 @@ msgstr "Сжатие не удалось: сожмите коммиты лока msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "Сжатие не разрешено: этот проект не позволяет вам сжимать коммиты при слиянии." -msgid "MergeRequests|Close the thread" -msgstr "" +msgid "MergeRequests|Thread stays open" +msgstr "Тема останется открытой" msgid "MergeRequests|Thread stays resolved" msgstr "" -msgid "MergeRequests|Reopen the thread" -msgstr "" +msgid "MergeRequests|Thread will be open" +msgstr "Тема будет открыта" msgid "MergeRequests|Thread will be resolved" msgstr "" diff --git a/locale/si_LK/gitlab.po b/locale/si_LK/gitlab.po index 993db4c763832f..f756a532f5545b 100644 --- a/locale/si_LK/gitlab.po +++ b/locale/si_LK/gitlab.po @@ -40669,13 +40669,13 @@ msgstr "" msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "" -msgid "MergeRequests|Close the thread" +msgid "MergeRequests|Thread stays open" msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "" -msgid "MergeRequests|Reopen the thread" +msgid "MergeRequests|Thread will be open" msgstr "" msgid "MergeRequests|Thread will be resolved" diff --git a/locale/tr_TR/gitlab.po b/locale/tr_TR/gitlab.po index 43ea92c244327c..b2e2cb77199392 100644 --- a/locale/tr_TR/gitlab.po +++ b/locale/tr_TR/gitlab.po @@ -40669,13 +40669,13 @@ msgstr "" msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "" -msgid "MergeRequests|Close the thread" +msgid "MergeRequests|Thread stays open" msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "" -msgid "MergeRequests|Reopen the thread" +msgid "MergeRequests|Thread will be open" msgstr "" msgid "MergeRequests|Thread will be resolved" diff --git a/locale/uk/gitlab.po b/locale/uk/gitlab.po index c27c7a88d6bc3c..52293273e1fc38 100644 --- a/locale/uk/gitlab.po +++ b/locale/uk/gitlab.po @@ -41275,13 +41275,13 @@ msgstr "" msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "" -msgid "MergeRequests|Close the thread" +msgid "MergeRequests|Thread stays open" msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "Обговорення залишається закритим" -msgid "MergeRequests|Reopen the thread" +msgid "MergeRequests|Thread stays open" msgstr "" msgid "MergeRequests|Thread will be resolved" diff --git a/locale/zh_CN/gitlab.po b/locale/zh_CN/gitlab.po index d899d5dfd332d1..814d7a058b1cd7 100644 --- a/locale/zh_CN/gitlab.po +++ b/locale/zh_CN/gitlab.po @@ -40366,13 +40366,13 @@ msgstr "压缩失败：本地提交，解决任何存在的冲突，然后推送 msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "不允许压缩：此项目不允许您在合并时压缩提交。" -msgid "MergeRequests|Close the thread" +msgid "MergeRequests|Thread stays open" msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "主题保持已解决状态" -msgid "MergeRequests|Reopen the thread" +msgid "MergeRequests|Thread will be open" msgstr "" msgid "MergeRequests|Thread will be resolved" diff --git a/locale/zh_HK/gitlab.po b/locale/zh_HK/gitlab.po index 952a2378e65a74..9047f7db2a6212 100644 --- a/locale/zh_HK/gitlab.po +++ b/locale/zh_HK/gitlab.po @@ -40366,13 +40366,13 @@ msgstr "" msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "" -msgid "MergeRequests|Close the thread" +msgid "MergeRequests|Thread stays open" msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "" -msgid "MergeRequests|Reopen the thread" +msgid "MergeRequests|Thread will be open" msgstr "" msgid "MergeRequests|Thread will be resolved" diff --git a/locale/zh_TW/gitlab.po b/locale/zh_TW/gitlab.po index e118b6ecd87f64..62b1c923103082 100644 --- a/locale/zh_TW/gitlab.po +++ b/locale/zh_TW/gitlab.po @@ -40366,13 +40366,13 @@ msgstr "壓縮 (Squash) 失敗：壓縮本地提交，解決任何存在的衝 msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging." msgstr "不允許壓縮 (Squash) : 此專案不允許您在合併時壓縮 (Squash) 提交。" -msgid "MergeRequests|Close the thread" +msgid "MergeRequests|Thread stays open" msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "話題保持已解決狀態" -msgid "MergeRequests|Reopen the thread" +msgid "MergeRequests|Thread will be open" msgstr "" msgid "MergeRequests|Thread will be resolved" -- GitLab From 9f2b82bb1e0bb6c762629cb39c2714aa8cc8b51a Mon Sep 17 00:00:00 2001 From: therealrinku Date: Mon, 6 Oct 2025 17:44:40 +0545 Subject: [PATCH 5/8] chore: restore translation files --- locale/de/gitlab.po | 4 ++-- locale/uk/gitlab.po | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/de/gitlab.po b/locale/de/gitlab.po index 3af18824fdaca8..aa091cb6df5916 100644 --- a/locale/de/gitlab.po +++ b/locale/de/gitlab.po @@ -40670,13 +40670,13 @@ msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to sq msgstr "Squashen nicht erlaubt: Dieses Projekt erlaubt es dir nicht, Commits bei der Zusammenführung zu squashen." msgid "MergeRequests|Thread stays open" -msgstr "" +msgstr "Thread bleibt offen" msgid "MergeRequests|Thread stays resolved" msgstr "Thread bleibt beendet" msgid "MergeRequests|Thread will be open" -msgstr "" +msgstr "Thread wird geöffnet" msgid "MergeRequests|Thread will be resolved" msgstr "Diskussion wird beendet" diff --git a/locale/uk/gitlab.po b/locale/uk/gitlab.po index 52293273e1fc38..794e8b65c4fff9 100644 --- a/locale/uk/gitlab.po +++ b/locale/uk/gitlab.po @@ -41281,7 +41281,7 @@ msgstr "" msgid "MergeRequests|Thread stays resolved" msgstr "Обговорення залишається закритим" -msgid "MergeRequests|Thread stays open" +msgid "MergeRequests|Thread will be open" msgstr "" msgid "MergeRequests|Thread will be resolved" -- GitLab From 30a3d67c66492ee3f6d026c16ad72fb826933578 Mon Sep 17 00:00:00 2001 From: therealrinku Date: Mon, 13 Oct 2025 19:40:01 +0545 Subject: [PATCH 6/8] fix: update newly suggested labels --- .../javascripts/batch_comments/mixins/resolved_status.js | 4 ++-- doc/user/project/merge_requests/reviews/_index.md | 2 +- locale/gitlab.pot | 4 ++-- spec/frontend/notes/components/note_actions_spec.js | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/batch_comments/mixins/resolved_status.js b/app/assets/javascripts/batch_comments/mixins/resolved_status.js index 3d50d5913df25b..5c008ebb3876a6 100644 --- a/app/assets/javascripts/batch_comments/mixins/resolved_status.js +++ b/app/assets/javascripts/batch_comments/mixins/resolved_status.js @@ -39,9 +39,9 @@ export default { ? s__('MergeRequests|Thread stays resolved') : s__('MergeRequests|Thread will be resolved'); } else if (discussionResolved) { - message = s__('MergeRequests|Reopen the thread'); + message = s__('MergeRequests|Reopen thread'); } else if (this.$options.showStaysResolved) { - message = s__('MergeRequests|Close the thread'); + message = s__('MergeRequests|Resolve thread'); } return message; diff --git a/doc/user/project/merge_requests/reviews/_index.md b/doc/user/project/merge_requests/reviews/_index.md index 86e2d12f1c4d9b..633d6a3bc0534b 100644 --- a/doc/user/project/merge_requests/reviews/_index.md +++ b/doc/user/project/merge_requests/reviews/_index.md @@ -196,7 +196,7 @@ Pending comments display information about delayed actions. GitLab does not perf until you publish the comment: - {{< icon name="check-circle-filled" >}} Resolves thread. -- {{< icon name="check-circle" >}} Close the thread. +- {{< icon name="check-circle" >}} Resolve thread. ## Submit a review diff --git a/locale/gitlab.pot b/locale/gitlab.pot index c774d756760207..84e904f3069164 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -41028,7 +41028,7 @@ msgstr "" msgid "MergeRequests|Can't perform this action automatically. It may have already been done, or a more recent commit may have updated some of this content. Please perform this action locally." msgstr "" -msgid "MergeRequests|Close the thread" +msgid "MergeRequests|Resolve thread" msgstr "" msgid "MergeRequests|Comment could not be submitted: %{reason}." @@ -41064,7 +41064,7 @@ msgstr "" msgid "MergeRequests|Reference copied" msgstr "" -msgid "MergeRequests|Reopen the thread" +msgid "MergeRequests|Reopen thread" msgstr "" msgid "MergeRequests|Requires that merge checks pass." diff --git a/spec/frontend/notes/components/note_actions_spec.js b/spec/frontend/notes/components/note_actions_spec.js index 6c950abd2eada0..873692e517c59b 100644 --- a/spec/frontend/notes/components/note_actions_spec.js +++ b/spec/frontend/notes/components/note_actions_spec.js @@ -353,7 +353,7 @@ describe('noteActions', () => { const resolveButton = wrapper.findComponent({ ref: 'resolveButton' }); expect(resolveButton.exists()).toBe(true); - expect(resolveButton.attributes('title')).toBe('Close the thread'); + expect(resolveButton.attributes('title')).toBe('Resolve thread'); }); }); -- GitLab From 6724c163f1043b54c465a8f26e1308041e467860 Mon Sep 17 00:00:00 2001 From: therealrinku Date: Mon, 13 Oct 2025 19:41:43 +0545 Subject: [PATCH 7/8] fix: update gitlab.pot --- locale/gitlab.pot | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 84e904f3069164..441d889b9366a3 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -41028,9 +41028,6 @@ msgstr "" msgid "MergeRequests|Can't perform this action automatically. It may have already been done, or a more recent commit may have updated some of this content. Please perform this action locally." msgstr "" -msgid "MergeRequests|Resolve thread" -msgstr "" - msgid "MergeRequests|Comment could not be submitted: %{reason}." msgstr "" @@ -41070,6 +41067,9 @@ msgstr "" msgid "MergeRequests|Requires that merge checks pass." msgstr "" +msgid "MergeRequests|Resolve thread" +msgstr "" + msgid "MergeRequests|Squashing failed: Squash the commits locally, resolve any conflicts, then push the branch." msgstr "" -- GitLab From 095a80c3b7cca2bc1b67aebe00e6b66d77f7bcb5 Mon Sep 17 00:00:00 2001 From: Rinku C Date: Tue, 21 Oct 2025 15:16:19 +0000 Subject: [PATCH 8/8] fix: update doc --- doc/user/project/merge_requests/reviews/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/user/project/merge_requests/reviews/_index.md b/doc/user/project/merge_requests/reviews/_index.md index 3844bf2819433d..cd44918bbc6854 100644 --- a/doc/user/project/merge_requests/reviews/_index.md +++ b/doc/user/project/merge_requests/reviews/_index.md @@ -185,7 +185,7 @@ Next, submit your review. ### Resolve or reopen thread with a comment -Review comments can also resolve or reopen comment threads. +Comments can also resolve or reopen comment threads. To resolve or reopen a thread when replying to a comment: 1. In the comment text area, write your comment. -- GitLab