summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorMichel Engelen <michel.engelen@diva-e.com>2019-06-12 16:15:51 +0200
committerMichel Engelen <michel@nomorejs.net>2019-07-02 14:29:15 +0200
commitec9b671b085201d269c8b3f4d3e32ec6e9f5ec8b (patch)
treed30fc40c44735fcc6c666a61ad23d932c896dbae /locale
parente6e0d2ccc4c4af13be360c9ee3669b66b933cf86 (diff)
downloadgitlab-ce-ec9b671b085201d269c8b3f4d3e32ec6e9f5ec8b.tar.gz
updated locale strings for !29553
Diffstat (limited to 'locale')
-rw-r--r--locale/gitlab.pot26
1 files changed, 19 insertions, 7 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index c57a974fe11..81d74fce3a8 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -2770,9 +2770,15 @@ msgstr ""
msgid "Comment & resolve discussion"
msgstr ""
+msgid "Comment & resolve thread"
+msgstr ""
+
msgid "Comment & unresolve discussion"
msgstr ""
+msgid "Comment & unresolve thread"
+msgstr ""
+
msgid "Comment form position"
msgstr ""
@@ -6301,7 +6307,7 @@ msgstr ""
msgid "MergeRequests|Reply..."
msgstr ""
-msgid "MergeRequests|Resolve this discussion in a new issue"
+msgid "MergeRequests|Resolve this thread in a new issue"
msgstr ""
msgid "MergeRequests|Saving the comment failed"
@@ -8767,7 +8773,7 @@ msgstr ""
msgid "Reset template"
msgstr ""
-msgid "Resolve all discussions in new issue"
+msgid "Resolve all threads in new issue"
msgstr ""
msgid "Resolve conflicts on source branch"
@@ -8776,6 +8782,9 @@ msgstr ""
msgid "Resolve discussion"
msgstr ""
+msgid "Resolve thread"
+msgstr ""
+
msgid "Resolved"
msgstr ""
@@ -11303,6 +11312,9 @@ msgstr ""
msgid "Unresolve discussion"
msgstr ""
+msgid "Unresolve thread"
+msgstr ""
+
msgid "Unschedule job"
msgstr ""
@@ -12459,11 +12471,6 @@ msgstr ""
msgid "disabled"
msgstr ""
-msgid "discussion resolved"
-msgid_plural "discussions resolved"
-msgstr[0] ""
-msgstr[1] ""
-
msgid "done"
msgstr ""
@@ -12943,6 +12950,11 @@ msgstr ""
msgid "to list"
msgstr ""
+msgid "thread resolved"
+msgid_plural "threads resolved"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "triggered"
msgstr ""