summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2018-08-06 21:51:37 +0000
committerClement Ho <clemmakesapps@gmail.com>2018-08-06 21:51:37 +0000
commite3127132a498cd3a39a325a5c0912ca6121e2f8a (patch)
treea4ab1c6cdd871dd6f4134387bed9da4021c0ec0d /locale
parentd737abc537476bf2b500f550b0c733d22f338cf1 (diff)
downloadgitlab-ce-e3127132a498cd3a39a325a5c0912ca6121e2f8a.tar.gz
Resolve "Improve Auto DevOps settings flow for admin and project"
Diffstat (limited to 'locale')
-rw-r--r--locale/gitlab.pot23
1 files changed, 7 insertions, 16 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 1ec6f1a0389..c159cddcc60 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -990,9 +990,6 @@ msgstr ""
msgid "CI/CD settings"
msgstr ""
-msgid "CICD|An explicit %{ci_file} needs to be specified before you can begin using Continuous Integration and Delivery."
-msgstr ""
-
msgid "CICD|Auto DevOps"
msgstr ""
@@ -1005,22 +1002,13 @@ msgstr ""
msgid "CICD|Continuous deployment to production"
msgstr ""
-msgid "CICD|Deployment strategy"
-msgstr ""
-
-msgid "CICD|Deployment strategy needs a domain name to work correctly."
-msgstr ""
-
-msgid "CICD|Disable Auto DevOps"
-msgstr ""
-
-msgid "CICD|Enable Auto DevOps"
+msgid "CICD|Default to Auto DevOps pipeline"
msgstr ""
-msgid "CICD|Follow the instance default to either have Auto DevOps enabled or disabled when there is no project specific %{ci_file}."
+msgid "CICD|Deployment strategy"
msgstr ""
-msgid "CICD|Instance default (%{state})"
+msgid "CICD|Deployment strategy needs a domain name to work correctly."
msgstr ""
msgid "CICD|Jobs"
@@ -1029,12 +1017,15 @@ msgstr ""
msgid "CICD|Learn more about Auto DevOps"
msgstr ""
-msgid "CICD|The Auto DevOps pipeline configuration will be used when there is no %{ci_file} in the project."
+msgid "CICD|The Auto DevOps pipeline will run if no alternative CI configuration file is found."
msgstr ""
msgid "CICD|You need to specify a domain if you want to use Auto Review Apps and Auto Deploy stages."
msgstr ""
+msgid "CICD|instance enabled"
+msgstr ""
+
msgid "Callback URL"
msgstr ""