summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorKushal Pandya <kushalspandya@gmail.com>2019-04-07 02:36:21 +0000
committerKushal Pandya <kushalspandya@gmail.com>2019-04-07 02:36:21 +0000
commit8f372152774119440ba41f2603eac4f475a601f6 (patch)
treec89f98207d31ee7ec53f403f3b2dd368f6d84a99 /locale
parent302dbfff2a298a2683997feca98589aff33228fb (diff)
parent7650677d3d832f9d65c8d38a2485ca60b97731c4 (diff)
downloadgitlab-ce-8f372152774119440ba41f2603eac4f475a601f6.tar.gz
Merge branch '_acet-related-mrs-widget-rewrite' into 'master'
Rewrite related MRs widget with Vue Closes #58926 and #57662 See merge request gitlab-org/gitlab-ce!27027
Diffstat (limited to 'locale')
-rw-r--r--locale/gitlab.pot14
1 files changed, 14 insertions, 0 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 711baff9f9a..3bc48e8c5d2 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -141,6 +141,9 @@ msgstr ""
msgid "%{lock_path} is locked by GitLab User %{lock_user_id}"
msgstr ""
+msgid "%{mrText}, this issue will be closed automatically."
+msgstr ""
+
msgid "%{number_commits_behind} commits behind %{default_branch}, %{number_commits_ahead} commits ahead"
msgstr ""
@@ -5830,6 +5833,9 @@ msgstr ""
msgid "Pipeline triggers"
msgstr ""
+msgid "Pipeline: %{status}"
+msgstr ""
+
msgid "PipelineCharts|Failed:"
msgstr ""
@@ -7510,6 +7516,9 @@ msgstr ""
msgid "Something went wrong while fetching comments. Please try again."
msgstr ""
+msgid "Something went wrong while fetching related merge requests."
+msgstr ""
+
msgid "Something went wrong while fetching the environments for this merge request. Please try again."
msgstr ""
@@ -9238,6 +9247,11 @@ msgstr ""
msgid "When enabled, users cannot use GitLab until the terms have been accepted."
msgstr ""
+msgid "When this merge request is accepted"
+msgid_plural "When these merge requests are accepted"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "When:"
msgstr ""