diff --git a/app/assets/javascripts/batch_comments/mixins/resolved_status.js b/app/assets/javascripts/batch_comments/mixins/resolved_status.js index da7c7809bedf7ff68de5e1bf520eded55630a06f..35ed283666d5a7b6cfd25563dff7436d71d494eb 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 4ff55cc27bd86166b61f10bb01ff07c3bc7572ee..1597cbc2dd9ca89f2dad25f7aff5d51bc5ebafcb 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 282163b4b2e174797f129f1e9ee85c18c57d5348..da38a8440318e1982f7180218ea4065c624aeed5 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 def8af83b91954c4dac6ac415f1d690e9e4783cc..9127241b0e7fb35275861fb30e522d761827917d 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 { />