summaryrefslogtreecommitdiff
path: root/locale/gitlab.pot
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-05-07 15:26:42 +0000
committerPhil Hughes <me@iamphill.com>2019-05-07 15:26:42 +0000
commit91acefb1f4ee4f747d4679d9c395a8c8dc33d6de (patch)
tree3ad8e6f5d0237539b51246cdda1e7c9cffa8ccb0 /locale/gitlab.pot
parent3e6e02a1d771d25d90da187ba414a434807a5b51 (diff)
parentd24d77a93a64e4698163c5ca579954f61ad9248a (diff)
downloadgitlab-ce-91acefb1f4ee4f747d4679d9c395a8c8dc33d6de.tar.gz
Merge branch '54405-resolve-discussion-when-applying-a-suggested-change' into 'master'
Resolve "Resolve discussion when suggestion is applied" Closes #54405 See merge request gitlab-org/gitlab-ce!28160
Diffstat (limited to 'locale/gitlab.pot')
-rw-r--r--locale/gitlab.pot6
1 files changed, 6 insertions, 0 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 05e56f2b89d..5aa048c28a3 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -1027,6 +1027,9 @@ msgstr ""
msgid "Applying multiple commands"
msgstr ""
+msgid "Applying suggestion"
+msgstr ""
+
msgid "Apr"
msgstr ""
@@ -9586,6 +9589,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 ""