summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorMichel Engelen <michel.engelen@diva-e.com>2019-06-13 15:57:52 +0200
committerMichel Engelen <michel@nomorejs.net>2019-07-02 14:29:54 +0200
commit9bc7b613d79deba285e783fab62dc34e55d6fa20 (patch)
tree28dcce13ff6c07320f6739a3a267fb70b1ccd60b /locale
parent895f03d59845fa0598f771d10bd9c40fd63499d1 (diff)
downloadgitlab-ce-9bc7b613d79deba285e783fab62dc34e55d6fa20.tar.gz
updated localization
Diffstat (limited to 'locale')
-rw-r--r--locale/gitlab.pot8
1 files changed, 4 insertions, 4 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 81d74fce3a8..b463a119399 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -11093,15 +11093,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 ""
@@ -12773,7 +12773,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."