diff options
| author | Paul Slaughter <pslaughter@gitlab.com> | 2019-05-06 12:56:48 -0500 |
|---|---|---|
| committer | Paul Slaughter <pslaughter@gitlab.com> | 2019-05-07 00:00:40 -0500 |
| commit | d24d77a93a64e4698163c5ca579954f61ad9248a (patch) | |
| tree | 36f10fd7ad3fd1949e473cbe485cc8971b0d8e45 /locale | |
| parent | dfe59c75bf4d6f6937767ee9ef35df4ef42e7667 (diff) | |
| download | gitlab-ce-d24d77a93a64e4698163c5ca579954f61ad9248a.tar.gz | |
Resolve discussion when suggestion is applied54405-resolve-discussion-when-applying-a-suggested-change
- Adds color and a tooltip to describe this new behavior
- Does not resolve if discussion is already resolved
- Adds an action `resolveDiscussion` to simplify `toggleResolveNote`
- Updates docs
https://gitlab.com/gitlab-org/gitlab-ce/issues/54405
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/gitlab.pot | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 445984c7847..50ff8a5e041 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -1024,6 +1024,9 @@ msgstr "" msgid "Applying multiple commands" msgstr "" +msgid "Applying suggestion" +msgstr "" + msgid "Apr" msgstr "" @@ -9517,6 +9520,9 @@ msgstr "" msgid "This action can lead to data loss. To prevent accidental actions we ask you to confirm your intention." msgstr "" +msgid "This also resolves the discussion" +msgstr "" + msgid "This application was created by %{link_to_owner}." msgstr "" |