summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Engelen <michel.engelen@diva-e.com>2019-06-13 15:57:52 +0200
committerMichel Engelen <michel.engelen@diva-e.com>2019-06-13 15:57:52 +0200
commitede4236f4eef9be7b3d7203868e9a733de542bc4 (patch)
treed6c190e106a9a4fedbea52525ecd2ed0afb61ee8
parenta8a5645909720100ee4d925f5dc0786a2bd84504 (diff)
downloadgitlab-ce-ede4236f4eef9be7b3d7203868e9a733de542bc4.tar.gz
updated localization
-rw-r--r--locale/gitlab.pot8
1 files changed, 4 insertions, 4 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 4dcdb0768a7..57ebfd96956 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -10771,15 +10771,15 @@ msgstr ""
msgid "Toggle commit list"
msgstr ""
-msgid "Toggle discussion"
-msgstr ""
-
msgid "Toggle emoji award"
msgstr ""
msgid "Toggle navigation"
msgstr ""
+msgid "Toggle thread"
+msgstr ""
+
msgid "ToggleButton|Toggle Status: OFF"
msgstr ""
@@ -12421,7 +12421,7 @@ msgstr ""
msgid "mrWidget|There are merge conflicts"
msgstr ""
-msgid "mrWidget|There are unresolved discussions. Please resolve these discussions"
+msgid "mrWidget|There are unresolved threads. Please resolve these threads"
msgstr ""
msgid "mrWidget|This feature merges changes from the target branch to the source branch. You cannot use this feature since the source branch is protected."