summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Engelen <michel.engelen@diva-e.com>2019-06-12 16:15:51 +0200
committerMichel Engelen <michel.engelen@diva-e.com>2019-06-12 16:15:51 +0200
commite95c2812e2eb6d1877042b73b50d214150021153 (patch)
tree771161536373affcad9e1d3f8fc087f6452f6f73
parente57ce3b10bf0551a7a43c61612304ed05e0bf786 (diff)
downloadgitlab-ce-e95c2812e2eb6d1877042b73b50d214150021153.tar.gz
updated locale strings for !29553
-rw-r--r--locale/gitlab.pot26
1 files changed, 19 insertions, 7 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 88ace6057cf..4dcdb0768a7 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -2661,9 +2661,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 ""
@@ -6114,7 +6120,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"
@@ -8511,7 +8517,7 @@ msgstr ""
msgid "Reset runners registration token"
msgstr ""
-msgid "Resolve all discussions in new issue"
+msgid "Resolve all threads in new issue"
msgstr ""
msgid "Resolve conflicts on source branch"
@@ -8520,6 +8526,9 @@ msgstr ""
msgid "Resolve discussion"
msgstr ""
+msgid "Resolve thread"
+msgstr ""
+
msgid "Resolved"
msgstr ""
@@ -10972,6 +10981,9 @@ msgstr ""
msgid "Unresolve discussion"
msgstr ""
+msgid "Unresolve thread"
+msgstr ""
+
msgid "Unschedule job"
msgstr ""
@@ -12107,11 +12119,6 @@ msgstr ""
msgid "disabled"
msgstr ""
-msgid "discussion resolved"
-msgid_plural "discussions resolved"
-msgstr[0] ""
-msgstr[1] ""
-
msgid "done"
msgstr ""
@@ -12582,6 +12589,11 @@ msgstr ""
msgid "this document"
msgstr ""
+msgid "thread resolved"
+msgid_plural "threads resolved"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "triggered"
msgstr ""