summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorClement Ho <408677-ClemMakesApps@users.noreply.gitlab.com>2019-08-19 20:05:34 +0000
committerClement Ho <408677-ClemMakesApps@users.noreply.gitlab.com>2019-08-19 20:05:34 +0000
commitfede390ce8a3edfae8dca04612d0039a4ed01572 (patch)
treefebd5c6fe62afbc935714bb33f0a7c1060b5284a /locale
parent50ff074e79a67a14abdd9f5fcce8d6c7729b179f (diff)
parenta59c9a137eb0a141bebdd0fffcb2e14fab54c4b5 (diff)
downloadgitlab-ce-fede390ce8a3edfae8dca04612d0039a4ed01572.tar.gz
Merge branch '66061-update-tooltip-of-detached-label-state' into 'master'
Resolve "Update tooltip of "detached" label/state" Closes #66061 See merge request gitlab-org/gitlab-ce!31917
Diffstat (limited to 'locale')
-rw-r--r--locale/gitlab.pot6
1 files changed, 3 insertions, 3 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index d84203ee911..26e6cb524bd 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -8020,6 +8020,9 @@ msgstr ""
msgid "Pipelines for last year"
msgstr ""
+msgid "Pipelines for merge requests are configured. A detached pipeline runs in the context of the merge request, and not against the merged result. Learn more on the documentation for Pipelines for Merged Results."
+msgstr ""
+
msgid "Pipelines settings for '%{project_name}' were successfully updated."
msgstr ""
@@ -11160,9 +11163,6 @@ msgstr ""
msgid "The character highlighter helps you keep the subject line to %{titleLength} characters and wrap the body at %{bodyLength} so they are readable in git."
msgstr ""
-msgid "The code of a detached pipeline is tested against the source branch instead of merged results"
-msgstr ""
-
msgid "The coding stage shows the time from the first commit to creating the merge request. The data will automatically be added here once you create your first merge request."
msgstr ""