From 82567ec7d8d49676c9a9a27a41af6067dbbdcd54 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Date: Fri, 27 Jun 2025 10:01:42 -0600
Subject: [PATCH] Use open and reopen instead of unresolve for threads

Changelog: changed
---
 .../batch_comments/mixins/resolved_status.js  |  4 +-
 .../behaviors/shortcuts/keybindings.js        |  4 +-
 .../design_notes/design_discussion.vue        |  2 +-
 .../notes/components/discussion_counter.vue   |  2 +-
 .../notes/components/note_form.vue            |  2 +-
 .../javascripts/notes/mixins/resolvable.js    |  2 +-
 .../components/checks/constants.js            |  2 +-
 .../checks/unresolved_discussions.vue         |  2 +-
 .../design_notes/design_discussion.vue        |  2 +-
 .../components/notes/work_item_add_note.vue   |  2 +-
 .../notes/work_item_comment_form.vue          |  2 +-
 app/views/shared/issuable/_form.html.haml     |  2 +-
 doc/api/discussions.md                        |  6 +--
 .../visual_studio_code/_index.md              |  2 +-
 doc/tutorials/merge_requests/homepage.md      |  2 +-
 doc/tutorials/reviews/_index.md               |  4 +-
 doc/user/discussions/_index.md                |  2 +-
 doc/user/group/manage.md                      |  2 +-
 doc/user/project/issues/design_management.md  |  4 +-
 doc/user/project/merge_requests/_index.md     | 20 ++++----
 .../merge_requests/approvals/_index.md        |  2 +-
 .../project/merge_requests/reviews/_index.md  | 10 ++--
 doc/user/shortcuts.md                         |  4 +-
 locale/gitlab.pot                             | 48 +++++++++----------
 ...dd_batch_comments_in_merge_request_spec.rb |  2 +-
 ...e_for_discussions_in_merge_request_spec.rb |  4 +-
 ...single_discussion_in_merge_request_spec.rb |  4 +-
 .../merge_request/batch_comments_spec.rb      |  2 +-
 ...diff_notes_and_discussions_resolve_spec.rb | 38 +++++++--------
 .../user_sees_discussions_navigation_spec.rb  |  4 +-
 ...epending_on_unresolved_discussions_spec.rb |  2 +-
 .../user_suggests_changes_on_diff_spec.rb     |  4 +-
 .../design_notes/design_discussion_spec.js    |  4 +-
 .../notes/components/note_actions_spec.js     |  2 +-
 .../components/checks/message_spec.js         |  2 +-
 .../checks/unresolved_discussions_spec.js     |  6 +--
 .../design_notes/design_discussion_spec.js    |  4 +-
 37 files changed, 106 insertions(+), 106 deletions(-)

diff --git a/app/assets/javascripts/batch_comments/mixins/resolved_status.js b/app/assets/javascripts/batch_comments/mixins/resolved_status.js
index da7c7809bedf7f..35ed283666d5a7 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 unresolved');
+        message = s__('MergeRequests|Thread will be open');
       } else if (this.$options.showStaysResolved) {
-        message = s__('MergeRequests|Thread stays unresolved');
+        message = s__('MergeRequests|Thread stays open');
       }
 
       return message;
diff --git a/app/assets/javascripts/behaviors/shortcuts/keybindings.js b/app/assets/javascripts/behaviors/shortcuts/keybindings.js
index 4ff55cc27bd861..1597cbc2dd9ca8 100644
--- a/app/assets/javascripts/behaviors/shortcuts/keybindings.js
+++ b/app/assets/javascripts/behaviors/shortcuts/keybindings.js
@@ -489,13 +489,13 @@ export const MR_TOGGLE_REVIEW = {
 
 export const MR_NEXT_UNRESOLVED_DISCUSSION = {
   id: 'mergeRequests.nextUnresolvedDiscussion',
-  description: __('Next unresolved thread'),
+  description: __('Next open thread'),
   defaultKeys: ['n'],
 };
 
 export const MR_PREVIOUS_UNRESOLVED_DISCUSSION = {
   id: 'mergeRequests.previousUnresolvedDiscussion',
-  description: __('Previous unresolved thread'),
+  description: __('Previous open thread'),
   defaultKeys: ['p'],
 };
 
diff --git a/app/assets/javascripts/design_management/components/design_notes/design_discussion.vue b/app/assets/javascripts/design_management/components/design_notes/design_discussion.vue
index 282163b4b2e174..da38a8440318e1 100644
--- a/app/assets/javascripts/design_management/components/design_notes/design_discussion.vue
+++ b/app/assets/javascripts/design_management/components/design_notes/design_discussion.vue
@@ -137,7 +137,7 @@ export default {
     },
     resolveCheckboxText() {
       return this.discussion.resolved
-        ? s__('DesignManagement|Unresolve thread')
+        ? s__('DesignManagement|Reopen thread')
         : s__('DesignManagement|Resolve thread');
     },
     firstNote() {
diff --git a/app/assets/javascripts/notes/components/discussion_counter.vue b/app/assets/javascripts/notes/components/discussion_counter.vue
index def8af83b91954..9127241b0e7fb3 100644
--- a/app/assets/javascripts/notes/components/discussion_counter.vue
+++ b/app/assets/javascripts/notes/components/discussion_counter.vue
@@ -142,7 +142,7 @@ export default {
         />
       </template>
       <template v-else>
-        {{ n__('%d unresolved thread', '%d unresolved threads', unresolvedDiscussionsCount) }}
+        {{ n__('%d open thread', '%d open threads', unresolvedDiscussionsCount) }}
         <gl-button-group class="gl-ml-3">
           <gl-button
             v-gl-tooltip.html="previousUnresolvedDiscussionTooltip"
diff --git a/app/assets/javascripts/notes/components/note_form.vue b/app/assets/javascripts/notes/components/note_form.vue
index f2fb29e52a2cb0..93d73f12a8ab9f 100644
--- a/app/assets/javascripts/notes/components/note_form.vue
+++ b/app/assets/javascripts/notes/components/note_form.vue
@@ -444,7 +444,7 @@ export default {
           <label>
             <template v-if="discussionResolved">
               <gl-form-checkbox v-model="isUnresolving" class="js-unresolve-checkbox">
-                {{ __('Unresolve thread') }}
+                {{ __('Reopen thread') }}
               </gl-form-checkbox>
             </template>
             <template v-else>
diff --git a/app/assets/javascripts/notes/mixins/resolvable.js b/app/assets/javascripts/notes/mixins/resolvable.js
index 814702b724ddd4..d39af6357d77fe 100644
--- a/app/assets/javascripts/notes/mixins/resolvable.js
+++ b/app/assets/javascripts/notes/mixins/resolvable.js
@@ -11,7 +11,7 @@ export default {
       return this.note.resolved;
     },
     resolveButtonTitle() {
-      return this.discussionResolved ? __('Unresolve thread') : __('Resolve thread');
+      return this.discussionResolved ? __('Reopen thread') : __('Resolve thread');
     },
   },
   methods: {
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/checks/constants.js b/app/assets/javascripts/vue_merge_request_widget/components/checks/constants.js
index 6bf25edc3d30cf..6077b0b88795c2 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/checks/constants.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/checks/constants.js
@@ -26,7 +26,7 @@ export const FAILURE_REASONS = {
   commits_status: __('Source branch exists and contains commits.'),
   ci_must_pass: __('Pipeline must succeed.'),
   conflict: __('Merge conflicts must be resolved.'),
-  discussions_not_resolved: __('Unresolved discussions must be resolved.'),
+  discussions_not_resolved: __('Open threads must be resolved.'),
   draft_status: __('Merge request must not be draft.'),
   not_open: __('Merge request must be open.'),
   need_rebase: __('Merge request must be rebased, because a fast-forward merge is not possible.'),
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/checks/unresolved_discussions.vue b/app/assets/javascripts/vue_merge_request_widget/components/checks/unresolved_discussions.vue
index a6970d9c795f20..d61ff9dfdfdc2e 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/checks/unresolved_discussions.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/checks/unresolved_discussions.vue
@@ -20,7 +20,7 @@ export default {
     tertiaryActionsButtons() {
       return [
         {
-          text: s__('mrWidget|Go to first unresolved thread'),
+          text: s__('mrWidget|Go to first open thread'),
           category: 'default',
           onClick: () => notesEventHub.$emit('jumpToFirstUnresolvedDiscussion'),
         },
diff --git a/app/assets/javascripts/work_items/components/design_management/design_notes/design_discussion.vue b/app/assets/javascripts/work_items/components/design_management/design_notes/design_discussion.vue
index e64dc04ccdeecd..51420c2d276df0 100644
--- a/app/assets/javascripts/work_items/components/design_management/design_notes/design_discussion.vue
+++ b/app/assets/javascripts/work_items/components/design_management/design_notes/design_discussion.vue
@@ -129,7 +129,7 @@ export default {
     },
     resolveCheckboxText() {
       return this.discussion.resolved
-        ? s__('DesignManagement|Unresolve thread')
+        ? s__('DesignManagement|Reopen thread')
         : s__('DesignManagement|Resolve thread');
     },
     firstNote() {
diff --git a/app/assets/javascripts/work_items/components/notes/work_item_add_note.vue b/app/assets/javascripts/work_items/components/notes/work_item_add_note.vue
index bd6790b872d41b..6d582bfa06466f 100644
--- a/app/assets/javascripts/work_items/components/notes/work_item_add_note.vue
+++ b/app/assets/javascripts/work_items/components/notes/work_item_add_note.vue
@@ -220,7 +220,7 @@ export default {
       };
     },
     resolveDiscussionTitle() {
-      return this.isDiscussionResolved ? __('Unresolve thread') : __('Resolve thread');
+      return this.isDiscussionResolved ? __('Reopen thread') : __('Resolve thread');
     },
     hasEmailParticipantsWidget() {
       return Boolean(findEmailParticipantsWidget(this.workItem));
diff --git a/app/assets/javascripts/work_items/components/notes/work_item_comment_form.vue b/app/assets/javascripts/work_items/components/notes/work_item_comment_form.vue
index 4cba432d454db9..606f9a996c3e22 100644
--- a/app/assets/javascripts/work_items/components/notes/work_item_comment_form.vue
+++ b/app/assets/javascripts/work_items/components/notes/work_item_comment_form.vue
@@ -202,7 +202,7 @@ export default {
       return !this.isNewDiscussion && this.isDiscussionResolvable && this.hasReplies;
     },
     resolveCheckboxLabel() {
-      return this.isDiscussionResolved ? __('Unresolve thread') : __('Resolve thread');
+      return this.isDiscussionResolved ? __('Reopen thread') : __('Resolve thread');
     },
     canMarkNoteAsInternal() {
       return this.workItem?.userPermissions?.markNoteAsInternal;
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml
index 8b0f29da0fdaf8..526f58fe344c2c 100644
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@@ -44,7 +44,7 @@
       = @discussion_to_resolve ? 'thread' : 'threads'
       at
       = link_to_discussions_to_resolve(@merge_request_to_resolve_discussions_of, @discussion_to_resolve)
-      will stay unresolved. Ask someone with permission to resolve
+      will stay open. Ask someone with permission to resolve
       = @discussion_to_resolve ? 'it.' : 'them.'
 
 = render_if_exists 'observability/observability_links', observability_values: @observability_values, issuable: issuable, project: project
diff --git a/doc/api/discussions.md b/doc/api/discussions.md
index 736fb149353712..1e47c547c97bc4 100644
--- a/doc/api/discussions.md
+++ b/doc/api/discussions.md
@@ -1088,7 +1088,7 @@ curl --request POST \
 
 ### Resolve a merge request thread
 
-Resolve or unresolve a thread of discussion in a merge request.
+Resolve or reopen a thread of discussion in a merge request.
 
 Prerequisites:
 
@@ -1105,7 +1105,7 @@ Parameters:
 | `id`                | integer/string | yes      | The ID or [URL-encoded path of the project](rest/_index.md#namespaced-paths). |
 | `discussion_id`     | string        | yes      | The ID of a thread. |
 | `merge_request_iid` | integer        | yes      | The IID of a merge request. |
-| `resolved`          | boolean        | yes      | Resolve or unresolve the discussion. |
+| `resolved`          | boolean        | yes      | Resolve or reopen the discussion. |
 
 ```shell
 curl --request PUT \
@@ -1156,7 +1156,7 @@ Parameters:
 | `merge_request_iid` | integer        | yes      | The IID of a merge request. |
 | `note_id`           | integer        | yes      | The ID of a thread note. |
 | `body`              | string         | no       | The content of the note or reply. Exactly one of `body` or `resolved` must be set. |
-| `resolved`          | boolean        | no       | Resolve or unresolve the note. Exactly one of `body` or `resolved` must be set. |
+| `resolved`          | boolean        | no       | Resolve or reopen the note. Exactly one of `body` or `resolved` must be set. |
 
 ```shell
 curl --request PUT \
diff --git a/doc/editor_extensions/visual_studio_code/_index.md b/doc/editor_extensions/visual_studio_code/_index.md
index b15413d426e40f..c40aa5e6a9742d 100644
--- a/doc/editor_extensions/visual_studio_code/_index.md
+++ b/doc/editor_extensions/visual_studio_code/_index.md
@@ -189,7 +189,7 @@ Use this extension to review, comment on, and approve merge requests without lea
 Use the diff to:
 
 - Review and create discussions.
-- Resolve and unresolve these discussions.
+- Resolve and reopen these discussions.
 - Delete and edit individual comments.
 
 ### Compare with default branch
diff --git a/doc/tutorials/merge_requests/homepage.md b/doc/tutorials/merge_requests/homepage.md
index ddac61972a2bfe..5574d98273673c 100644
--- a/doc/tutorials/merge_requests/homepage.md
+++ b/doc/tutorials/merge_requests/homepage.md
@@ -76,7 +76,7 @@ Each table row groups related information about a merge request together into co
 - **Author** - The author's avatar.
 - **Reviewers** - The reviewers' avatars. Reviewers with a green check mark have approved the merge request.
 - **Checks** - A compact assessment of mergeability.
-  - Number of unresolved threads, for example `0 of 3`.
+  - Number of open threads, for example `0 of 3`.
   - Current required [approval status](../../user/project/merge_requests/approvals/_index.md#in-the-list-of-merge-requests).
   - Most recent pipeline's status.
   - Date of last update.
diff --git a/doc/tutorials/reviews/_index.md b/doc/tutorials/reviews/_index.md
index 0bacf793b6954f..d28c9057d19a96 100644
--- a/doc/tutorials/reviews/_index.md
+++ b/doc/tutorials/reviews/_index.md
@@ -87,9 +87,9 @@ to a problem or a feature request in an issue.
 
 Below the description, check the merge request widget to understand the
 current status of this work. This example shows a merge widget for a merge request
-that is missing approvals, is still in draft mode, and has unresolved discussion threads:
+that is missing approvals, is still in draft mode, and has open discussion threads:
 
-![Merge widget showing blocked status with three failed checks: missing approvals, draft mode, and unresolved discussions](img/widget_v17_0.png)
+![Merge widget showing blocked status with three failed checks: missing approvals, draft mode, and open threads](img/widget_v17_0.png)
 
 - Does it cross-link to an issue? Check the description and merge widget
   for links to other issues. Some merge requests are straightforward, but
diff --git a/doc/user/discussions/_index.md b/doc/user/discussions/_index.md
index 5e0259309a78c8..10869fef5147bc 100644
--- a/doc/user/discussions/_index.md
+++ b/doc/user/discussions/_index.md
@@ -352,7 +352,7 @@ To resolve a thread:
 Additionally, in merge requests, you can [do more with threads](../project/merge_requests/_index.md#resolve-a-thread),
 such as:
 
-- Move unresolved threads to a new issue.
+- Move open threads to a new issue.
 - Prevent merging until all threads are resolved.
 
 ## Summarize issue discussions with Duo Chat
diff --git a/doc/user/group/manage.md b/doc/user/group/manage.md
index 79ce4df4049cc2..bb284d97e3197d 100644
--- a/doc/user/group/manage.md
+++ b/doc/user/group/manage.md
@@ -561,7 +561,7 @@ To change this behavior:
 
 ### Prevent merge unless all threads are resolved
 
-You can prevent merge requests from being merged until all threads are resolved. When this setting is enabled, child projects in your group display unresolved thread counts in orange on merge requests with at least one unresolved thread.
+You can prevent merge requests from being merged until all threads are resolved. When this setting is enabled, child projects in your group display open thread counts in orange on merge requests with at least one open thread.
 
 Prerequisites:
 
diff --git a/doc/user/project/issues/design_management.md b/doc/user/project/issues/design_management.md
index 6b1892ec8c3e94..4ab099223d4ad7 100644
--- a/doc/user/project/issues/design_management.md
+++ b/doc/user/project/issues/design_management.md
@@ -273,9 +273,9 @@ To delete a comment from a design:
 
 When you're done discussing part of a design, you can resolve the discussion thread.
 
-To mark a thread as resolved or unresolved, either:
+To mark a thread as resolved or open, either:
 
-- In the upper-right corner of the first comment of the discussion, select **Resolve thread** or **Unresolve thread** ({{< icon name="check-circle" >}}).
+- In the upper-right corner of the first comment of the discussion, select **Resolve thread** or **Reopen thread** ({{< icon name="check-circle" >}}).
 - Add a new comment to the thread and select or clear the **Resolve thread** checkbox.
 
 Resolving a discussion thread also marks any pending [to-do items](../../todos.md) related to notes
diff --git a/doc/user/project/merge_requests/_index.md b/doc/user/project/merge_requests/_index.md
index 3df85f8b5e205b..55f611bf262771 100644
--- a/doc/user/project/merge_requests/_index.md
+++ b/doc/user/project/merge_requests/_index.md
@@ -377,17 +377,17 @@ sort order by clicking the sort button on the right.
 When you want to finish a conversation in a merge request,
 [resolve a thread](../../discussions/_index.md#resolve-a-thread).
 
-GitLab shows the number of unresolved threads in the top right corner of a
-merge request, like this: `7 unresolved threads`.
+GitLab shows the number of open threads in the top right corner of a
+merge request, like this: `7 open threads`.
 
-### Move all unresolved threads in a merge request to an issue
+### Move all open threads in a merge request to an issue
 
-If you have multiple unresolved threads in a merge request, you can
+If you have multiple open threads in a merge request, you can
 create an issue to resolve them separately:
 
 1. On the left sidebar, select **Search or go to** and find your project.
 1. Select **Code > Merge requests** and find your merge request.
-1. In the merge request, in the top right, find the **Unresolved threads**
+1. In the merge request, in the top right, find the **Open threads**
    dropdown list, and select **Thread options** ({{< icon name="ellipsis_v" >}}).
 1. Select **Resolve all with new issue**.
 1. Fill out the fields in the new issue, and select **Create issue**.
@@ -395,9 +395,9 @@ create an issue to resolve them separately:
 GitLab marks all threads as resolved, and adds a link from the merge request to
 the newly created issue.
 
-### Move one unresolved thread in a merge request to an issue
+### Move one open thread in a merge request to an issue
 
-If you have one specific unresolved thread in a merge request, you can
+If you have one specific open thread in a merge request, you can
 create an issue to resolve it separately:
 
 1. On the left sidebar, select **Search or go to** and find your project.
@@ -412,9 +412,9 @@ the newly created issue.
 
 ### Prevent merge unless all threads are resolved
 
-You can prevent merge requests from merging while threads remain unresolved.
-When you enable this setting, the **Unresolved threads** counter in a merge request
-is shown in orange while at least one thread remains unresolved.
+You can prevent merge requests from merging while threads remain open.
+When you enable this setting, the **Open threads** counter in a merge request
+is shown in orange while at least one thread remains open.
 
 1. On the left sidebar, select **Search or go to** and find your project.
 1. Select **Settings > Merge requests**.
diff --git a/doc/user/project/merge_requests/approvals/_index.md b/doc/user/project/merge_requests/approvals/_index.md
index 246391a4a4218a..0c8aea3b2f2195 100644
--- a/doc/user/project/merge_requests/approvals/_index.md
+++ b/doc/user/project/merge_requests/approvals/_index.md
@@ -158,7 +158,7 @@ Approved merge requests display a green check mark ({{< icon name="check-circle-
 After a merge request receives the required approvals, it is ready to merge, unless it's blocked due to:
 
 - [Merge conflicts](../conflicts.md)
-- [Unresolved threads](../_index.md#prevent-merge-unless-all-threads-are-resolved)
+- [Open threads](../_index.md#prevent-merge-unless-all-threads-are-resolved)
 - [Failed CI/CD pipeline](../auto_merge.md)
 
 ### Prevent author approval
diff --git a/doc/user/project/merge_requests/reviews/_index.md b/doc/user/project/merge_requests/reviews/_index.md
index 931df0f7055cf8..cc874f5d07bd6d 100644
--- a/doc/user/project/merge_requests/reviews/_index.md
+++ b/doc/user/project/merge_requests/reviews/_index.md
@@ -179,20 +179,20 @@ To start your review of a merge request:
 
 Next, submit your review.
 
-### Resolve or unresolve thread with a comment
+### Resolve or reopen thread with a comment
 
-Review comments can also resolve or unresolve [resolvable threads](../_index.md#resolve-a-thread).
-To resolve or unresolve a thread when replying to a comment:
+Review comments can also resolve or reopen [resolvable threads](../_index.md#resolve-a-thread).
+To resolve or reopen a thread when replying to a comment:
 
 1. In the comment text area, write your comment.
-1. Select or clear **Resolve thread**.
+1. Select or clear **Resolve thread** or **Reopen thread**.
 1. Select **Add comment now** or **Add to review**.
 
 Pending comments display information about delayed actions. GitLab does not perform these actions
 until you publish the comment:
 
 - {{< icon name="check-circle-filled" >}} Resolves thread.
-- {{< icon name="check-circle" >}} Thread stays unresolved.
+- {{< icon name="check-circle" >}} Thread stays open.
 
 ## Submit a review
 
diff --git a/doc/user/shortcuts.md b/doc/user/shortcuts.md
index 0e78dd6ed64987..2cfaa27408ead8 100644
--- a/doc/user/shortcuts.md
+++ b/doc/user/shortcuts.md
@@ -120,8 +120,8 @@ These shortcuts are available when viewing [merge requests](project/merge_reques
 | <kbd>]</kbd> or <kbd>j</kbd>      |                                   | Move to next file. |
 | <kbd>&#91;</kbd> or <kbd>k</kbd>  |                                   | Move to previous file. |
 | <kbd>Command</kbd> + <kbd>p</kbd> | <kbd>Control</kbd> + <kbd>p</kbd> | Search for, and then jump to a file for review. |
-| <kbd>n</kbd>                      |                                   | Move to next unresolved discussion. |
-| <kbd>p</kbd>                      |                                   | Move to previous unresolved discussion. |
+| <kbd>n</kbd>                      |                                   | Move to next open thread. |
+| <kbd>p</kbd>                      |                                   | Move to previous open thread. |
 | <kbd>b</kbd>                      |                                   | Copy source branch name. |
 | <kbd>c</kbd> + <kbd>r</kbd>       |                                   | Copy merge request reference. |
 | <kbd>r</kbd>                      |                                   | Start writing a comment. Pre-selected text is quoted in the comment. |
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 3cf9ea106360ae..ec6fe5e4d910eb 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -416,6 +416,11 @@ msgid_plural "%d more comments"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "%d open thread"
+msgid_plural "%d open threads"
+msgstr[0] ""
+msgstr[1] ""
+
 msgid "%d option"
 msgid_plural "%d options"
 msgstr[0] ""
@@ -521,11 +526,6 @@ msgid_plural "%d templates found"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "%d unresolved thread"
-msgid_plural "%d unresolved threads"
-msgstr[0] ""
-msgstr[1] ""
-
 msgid "%d version"
 msgid_plural "%d versions"
 msgstr[0] ""
@@ -22482,6 +22482,9 @@ msgstr ""
 msgid "DesignManagement|Hide comments"
 msgstr ""
 
+msgid "DesignManagement|Reopen thread"
+msgstr ""
+
 msgid "DesignManagement|Requested design version does not exist."
 msgstr ""
 
@@ -22530,9 +22533,6 @@ msgstr ""
 msgid "DesignManagement|To upload designs, you'll need to enable LFS and have an admin enable hashed storage. %{requirements_link_start}More information%{requirements_link_end}"
 msgstr ""
 
-msgid "DesignManagement|Unresolve thread"
-msgstr ""
-
 msgid "DesignManagement|Unselect the design"
 msgstr ""
 
@@ -38884,16 +38884,16 @@ msgstr ""
 msgid "MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging."
 msgstr ""
 
-msgid "MergeRequests|Thread stays resolved"
+msgid "MergeRequests|Thread stays open"
 msgstr ""
 
-msgid "MergeRequests|Thread stays unresolved"
+msgid "MergeRequests|Thread stays resolved"
 msgstr ""
 
-msgid "MergeRequests|Thread will be resolved"
+msgid "MergeRequests|Thread will be open"
 msgstr ""
 
-msgid "MergeRequests|Thread will be unresolved"
+msgid "MergeRequests|Thread will be resolved"
 msgstr ""
 
 msgid "MergeRequests|View file @ %{commitId}"
@@ -41055,6 +41055,9 @@ msgstr ""
 msgid "Next file in diff"
 msgstr ""
 
+msgid "Next open thread"
+msgstr ""
+
 msgid "Next scan"
 msgstr ""
 
@@ -41064,9 +41067,6 @@ msgstr ""
 msgid "Next step in review workflow"
 msgstr ""
 
-msgid "Next unresolved thread"
-msgstr ""
-
 msgid "Next update"
 msgstr ""
 
@@ -43237,6 +43237,9 @@ msgstr ""
 msgid "Open raw"
 msgstr ""
 
+msgid "Open threads must be resolved."
+msgstr ""
+
 msgid "Open with"
 msgstr ""
 
@@ -47099,10 +47102,10 @@ msgstr ""
 msgid "Previous file in diff"
 msgstr ""
 
-msgid "Previous step"
+msgid "Previous open thread"
 msgstr ""
 
-msgid "Previous unresolved thread"
+msgid "Previous step"
 msgstr ""
 
 msgid "Primary navigation sidebar"
@@ -51654,6 +51657,9 @@ msgstr ""
 msgid "Reopen this %{quick_action_target}"
 msgstr ""
 
+msgid "Reopen thread"
+msgstr ""
+
 msgid "Reopened this %{quick_action_target}."
 msgstr ""
 
@@ -66066,15 +66072,9 @@ msgstr ""
 msgid "Unresolve"
 msgstr ""
 
-msgid "Unresolve thread"
-msgstr ""
-
 msgid "Unresolved"
 msgstr ""
 
-msgid "Unresolved discussions must be resolved."
-msgstr ""
-
 msgid "Unschedule job"
 msgstr ""
 
@@ -74345,7 +74345,7 @@ msgstr ""
 msgid "mrWidget|GitLab %{linkStart}CI/CD can automatically build, test, and deploy your application.%{linkEnd} It only takes a few minutes to get started, and we can help you create a pipeline configuration file."
 msgstr ""
 
-msgid "mrWidget|Go to first unresolved thread"
+msgid "mrWidget|Go to first open thread"
 msgstr ""
 
 msgid "mrWidget|If the %{type} branch exists in your local repository, you can merge this merge request manually using the command line."
diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/add_batch_comments_in_merge_request_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/add_batch_comments_in_merge_request_spec.rb
index c3abc50c242645..247aee07869c12 100644
--- a/qa/qa/specs/features/browser_ui/3_create/merge_request/add_batch_comments_in_merge_request_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/add_batch_comments_in_merge_request_spec.rb
@@ -22,7 +22,7 @@ module QA
 
           expect(show).to have_comment('new comment to start review')
           expect(show).to have_comment('comment added to review')
-          expect(show).to have_content("2 unresolved threads")
+          expect(show).to have_content("2 open threads")
         end
       end
 
diff --git a/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb b/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb
index c15ac820620c4f..c5e7d93af6e47e 100644
--- a/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb
+++ b/spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb
@@ -77,7 +77,7 @@ def resolve_all_discussions_link_selector(title: "")
         it 'shows a warning that the merge request contains unresolved threads' do
           click_button 'Expand merge checks'
 
-          expect(page).to have_content 'Unresolved discussions must be resolved'
+          expect(page).to have_content 'Open threads must be resolved'
         end
       end
     end
@@ -91,7 +91,7 @@ def resolve_all_discussions_link_selector(title: "")
     end
 
     it 'shows a notice to ask someone else to resolve the threads' do
-      expect(page).to have_content("The threads at #{merge_request.to_reference} will stay unresolved. Ask someone with permission to resolve them.")
+      expect(page).to have_content("The threads at #{merge_request.to_reference} will stay open. Ask someone with permission to resolve them.")
     end
   end
 end
diff --git a/spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb b/spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb
index e996b8d7392a53..dda2c79bb08dea 100644
--- a/spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb
+++ b/spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb
@@ -48,7 +48,7 @@ def resolve_discussion_selector
 
       it 'shows the link for creating a new issue when unresolving a thread' do
         page.within '.diff-content' do
-          click_button 'Unresolve thread'
+          click_button 'Reopen thread'
         end
 
         expect(page).to have_css resolve_discussion_selector
@@ -87,7 +87,7 @@ def resolve_discussion_selector
 
     it 'shows a notice to ask someone else to resolve the threads' do
       expect(page).to have_content("The thread at #{merge_request.to_reference} "\
-                                   "(discussion #{discussion.first_note.id}) will stay unresolved. "\
+                                   "(discussion #{discussion.first_note.id}) will stay open. "\
                                    "Ask someone with permission to resolve it.")
     end
   end
diff --git a/spec/features/merge_request/batch_comments_spec.rb b/spec/features/merge_request/batch_comments_spec.rb
index 3aeae1206845e8..1c139495db08c6 100644
--- a/spec/features/merge_request/batch_comments_spec.rb
+++ b/spec/features/merge_request/batch_comments_spec.rb
@@ -314,7 +314,7 @@ def write_reply_to_discussion(button_text: 'Start a review', text: 'Line is wron
       end
 
       if unresolve
-        page.check('Unresolve thread')
+        page.check('Reopen thread')
       end
 
       click_button(button_text)
diff --git a/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb b/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb
index caaaca9f1d0882..8747479e197f63 100644
--- a/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb
+++ b/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb
@@ -37,7 +37,7 @@
     context 'single thread' do
       it 'shows text with how many threads' do
         page.within(first('.discussions-counter')) do
-          expect(page).to have_content('1 unresolved thread')
+          expect(page).to have_content('1 open thread')
         end
       end
 
@@ -51,7 +51,7 @@
         end
 
         page.within '.diff-content' do
-          expect(page).to have_selector('.btn', text: 'Unresolve thread')
+          expect(page).to have_selector('.btn', text: 'Reopen thread')
         end
 
         page.within(first('.discussions-counter')) do
@@ -74,11 +74,11 @@
       it 'allows user to unresolve thread' do
         page.within '.diff-content' do
           find('button[data-testid="resolve-discussion-button"]').click
-          click_button 'Unresolve thread'
+          click_button 'Reopen thread'
         end
 
         page.within(first('.discussions-counter')) do
-          expect(page).to have_content('1 unresolved thread')
+          expect(page).to have_content('1 open thread')
         end
       end
 
@@ -155,13 +155,13 @@
 
           it 'allows user to unresolve from reply form without a comment' do
             page.within '.diff-content' do
-              click_button 'Unresolve thread'
+              click_button 'Reopen thread'
 
               wait_for_requests
             end
 
             page.within(first('.discussions-counter')) do
-              expect(page).to have_content('1 unresolved thread')
+              expect(page).to have_content('1 open thread')
             end
           end
 
@@ -177,7 +177,7 @@
             end
 
             page.within(first('.discussions-counter')) do
-              expect(page).to have_content('1 unresolved thread')
+              expect(page).to have_content('1 open thread')
             end
           end
         end
@@ -211,7 +211,7 @@
 
       it 'allows user to quickly scroll to next unresolved thread', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/410109' do
         page.within(first('.discussions-counter')) do
-          click_button _('Next unresolved thread')
+          click_button _('Next open thread')
         end
 
         expect(page).to have_button('Resolve thread', visible: true)
@@ -291,7 +291,7 @@
 
       it 'shows text with how many threads' do
         page.within(first('.discussions-counter')) do
-          expect(page).to have_content('2 unresolved threads')
+          expect(page).to have_content('2 open threads')
         end
       end
 
@@ -299,7 +299,7 @@
         click_button('Resolve thread', match: :first)
 
         page.within(first('.discussions-counter')) do
-          expect(page).to have_content('1 unresolved thread')
+          expect(page).to have_content('1 open thread')
         end
       end
 
@@ -325,7 +325,7 @@
         end
       end
 
-      it 'allows user to quickly scroll to next unresolved thread' do
+      it 'allows user to quickly scroll to next open thread' do
         page.within('.discussion-reply-holder', match: :first) do
           find('button[data-testid="resolve-discussion-button"]').click
         end
@@ -376,7 +376,7 @@
     context 'changes tab' do
       it 'shows text with how many threads' do
         page.within(first('.discussions-counter')) do
-          expect(page).to have_content('1 unresolved thread')
+          expect(page).to have_content('1 open thread')
         end
       end
 
@@ -386,7 +386,7 @@
         end
 
         page.within '.diff-content' do
-          expect(page).to have_selector('.btn', text: 'Unresolve thread')
+          expect(page).to have_selector('.btn', text: 'Reopen thread')
         end
 
         page.within(first('.discussions-counter')) do
@@ -407,11 +407,11 @@
       it 'allows user to unresolve thread' do
         page.within '.diff-content' do
           find('button[data-testid="resolve-discussion-button"]').click
-          click_button 'Unresolve thread'
+          click_button 'Reopen thread'
         end
 
         page.within(first('.discussions-counter')) do
-          expect(page).to have_content('1 unresolved thread')
+          expect(page).to have_content('1 open thread')
         end
       end
 
@@ -446,7 +446,7 @@
         end
 
         page.within(first('.discussions-counter')) do
-          expect(page).to have_content('1 unresolved thread')
+          expect(page).to have_content('1 open thread')
         end
       end
     end
@@ -469,7 +469,7 @@
         end
 
         page.within(first('.discussions-counter')) do
-          expect(page).to have_content('1 unresolved thread')
+          expect(page).to have_content('1 open thread')
         end
       end
 
@@ -493,7 +493,7 @@
         end
 
         page.within '.diff-content' do
-          expect(page).to have_selector('.btn', text: 'Unresolve thread')
+          expect(page).to have_selector('.btn', text: 'Reopen thread')
         end
 
         page.within(first('.discussions-counter')) do
@@ -515,7 +515,7 @@
         end
 
         page.within(first('.discussions-counter')) do
-          expect(page).to have_content('1 unresolved thread')
+          expect(page).to have_content('1 open thread')
         end
       end
     end
diff --git a/spec/features/merge_request/user_sees_discussions_navigation_spec.rb b/spec/features/merge_request/user_sees_discussions_navigation_spec.rb
index 1c63dfde8aac56..401888a4538e51 100644
--- a/spec/features/merge_request/user_sees_discussions_navigation_spec.rb
+++ b/spec/features/merge_request/user_sees_discussions_navigation_spec.rb
@@ -192,13 +192,13 @@
   end
 
   def goto_next_thread
-    click_button 'Next unresolved thread', obscured: false
+    click_button 'Next open thread', obscured: false
     # Wait for scroll
     sleep(1)
   end
 
   def goto_previous_thread
-    click_button 'Previous unresolved thread', obscured: false
+    click_button 'Previous open thread', obscured: false
     # Wait for scroll
     sleep(1)
   end
diff --git a/spec/features/merge_request/user_sees_merge_button_depending_on_unresolved_discussions_spec.rb b/spec/features/merge_request/user_sees_merge_button_depending_on_unresolved_discussions_spec.rb
index 5843585a95c7d8..4a95a967a57890 100644
--- a/spec/features/merge_request/user_sees_merge_button_depending_on_unresolved_discussions_spec.rb
+++ b/spec/features/merge_request/user_sees_merge_button_depending_on_unresolved_discussions_spec.rb
@@ -25,7 +25,7 @@
 
         click_button 'Expand merge checks'
 
-        expect(page).to have_content('Unresolved discussions must be resolved')
+        expect(page).to have_content('Open threads must be resolved')
       end
     end
 
diff --git a/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb b/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb
index 42dd0f8bc87f34..dd9dc31c2d4f6a 100644
--- a/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb
+++ b/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb
@@ -399,13 +399,13 @@ def hash(path)
 
     it 'resolves discussion when applied' do
       page.within("[id='#{hash}']") do
-        expect(page).not_to have_content('Unresolve thread')
+        expect(page).not_to have_content('Reopen thread')
 
         click_button('Apply suggestion')
         click_button('Apply')
         wait_for_requests
 
-        expect(page).to have_content('Unresolve thread')
+        expect(page).to have_content('Reopen thread')
       end
     end
   end
diff --git a/spec/frontend/design_management/components/design_notes/design_discussion_spec.js b/spec/frontend/design_management/components/design_notes/design_discussion_spec.js
index cfe350c15a21b9..ac94e70cf07b53 100644
--- a/spec/frontend/design_management/components/design_notes/design_discussion_spec.js
+++ b/spec/frontend/design_management/components/design_notes/design_discussion_spec.js
@@ -247,12 +247,12 @@ describe('Design discussions component', () => {
         expect(findReplyPlaceholder().isVisible()).toBe(true);
       });
 
-      it('renders a checkbox with Unresolve thread text in reply form', async () => {
+      it('renders a checkbox with Reopen thread text in reply form', async () => {
         findReplyPlaceholder().vm.$emit('focus');
         wrapper.setProps({ discussionWithOpenForm: defaultMockDiscussion.id });
 
         await nextTick();
-        expect(findResolveCheckbox().text()).toBe('Unresolve thread');
+        expect(findResolveCheckbox().text()).toBe('Reopen thread');
       });
     });
   });
diff --git a/spec/frontend/notes/components/note_actions_spec.js b/spec/frontend/notes/components/note_actions_spec.js
index dba86041fe353a..e47d080a7fcf8f 100644
--- a/spec/frontend/notes/components/note_actions_spec.js
+++ b/spec/frontend/notes/components/note_actions_spec.js
@@ -342,7 +342,7 @@ describe('noteActions', () => {
       const resolveButton = wrapper.findComponent({ ref: 'resolveButton' });
 
       expect(resolveButton.exists()).toBe(true);
-      expect(resolveButton.attributes('title')).toBe('Thread stays unresolved');
+      expect(resolveButton.attributes('title')).toBe('Thread stays open');
     });
   });
 
diff --git a/spec/frontend/vue_merge_request_widget/components/checks/message_spec.js b/spec/frontend/vue_merge_request_widget/components/checks/message_spec.js
index 87f2f69422a23d..f35c5fed5fb8f7 100644
--- a/spec/frontend/vue_merge_request_widget/components/checks/message_spec.js
+++ b/spec/frontend/vue_merge_request_widget/components/checks/message_spec.js
@@ -16,7 +16,7 @@ describe('Merge request merge checks message component', () => {
     ${'commits_status'}             | ${'Source branch exists and contains commits.'}
     ${'ci_must_pass'}               | ${'Pipeline must succeed.'}
     ${'conflict'}                   | ${'Merge conflicts must be resolved.'}
-    ${'discussions_not_resolved'}   | ${'Unresolved discussions must be resolved.'}
+    ${'discussions_not_resolved'}   | ${'Open threads must be resolved.'}
     ${'draft_status'}               | ${'Merge request must not be draft.'}
     ${'not_open'}                   | ${'Merge request must be open.'}
     ${'need_rebase'}                | ${'Merge request must be rebased, because a fast-forward merge is not possible.'}
diff --git a/spec/frontend/vue_merge_request_widget/components/checks/unresolved_discussions_spec.js b/spec/frontend/vue_merge_request_widget/components/checks/unresolved_discussions_spec.js
index fc83901b318609..8413a0cbf3d442 100644
--- a/spec/frontend/vue_merge_request_widget/components/checks/unresolved_discussions_spec.js
+++ b/spec/frontend/vue_merge_request_widget/components/checks/unresolved_discussions_spec.js
@@ -31,9 +31,9 @@ describe('MergeChecksUnresolvedDiscussions component', () => {
     expect(wrapper.findComponent(MergeChecksMessage).props('check')).toEqual(check);
   });
 
-  it('does not show go to first unresolved discussion button with passed state', () => {
+  it('does not show go to first open discussion button with passed state', () => {
     createComponent({ check: { status: 'success', identifier: 'discussions_not_resolved' } });
-    const button = wrapper.findByRole('button', { name: 'Go to first unresolved thread' });
+    const button = wrapper.findByRole('button', { name: 'Go to first open thread' });
     expect(button.exists()).toBe(false);
   });
 
@@ -42,7 +42,7 @@ describe('MergeChecksUnresolvedDiscussions component', () => {
     notesEventHub.$on('jumpToFirstUnresolvedDiscussion', callback);
     createComponent();
 
-    wrapper.findByRole('button', { name: 'Go to first unresolved thread' }).trigger('click');
+    wrapper.findByRole('button', { name: 'Go to first open thread' }).trigger('click');
 
     expect(callback).toHaveBeenCalled();
   });
diff --git a/spec/frontend/work_items/components/design_management/design_notes/design_discussion_spec.js b/spec/frontend/work_items/components/design_management/design_notes/design_discussion_spec.js
index d322b1562f8d25..0207f9357a9011 100644
--- a/spec/frontend/work_items/components/design_management/design_notes/design_discussion_spec.js
+++ b/spec/frontend/work_items/components/design_management/design_notes/design_discussion_spec.js
@@ -284,12 +284,12 @@ describe('Design discussions component', () => {
         expect(findReplyPlaceholder().isVisible()).toBe(true);
       });
 
-      it('renders a checkbox with Unresolve thread text in reply form', async () => {
+      it('renders a checkbox with Reopen thread text in reply form', async () => {
         findReplyPlaceholder().vm.$emit('focus');
         wrapper.setProps({ discussionWithOpenForm: defaultMockDiscussion.id });
 
         await nextTick();
-        expect(findResolveCheckbox().text()).toBe('Unresolve thread');
+        expect(findResolveCheckbox().text()).toBe('Reopen thread');
       });
     });
 
-- 
GitLab