Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-25 12:06:06 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-25 12:06:06 +0300
commit0ccbbf166fb77f59989f05ae9bba31952d218583 (patch)
treeb7b180c52b02c3909d508e5821faed978b08a177 /locale
parent8f8838a1d9d045fd75cfa70c4f7daa4f080084e9 (diff)
Add latest changes from gitlab-org/gitlab@master
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 7eb6d211cb7..07d54a9a696 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -20040,9 +20040,6 @@ msgstr ""
msgid "mrWidget|%{metricsLinkStart} Memory %{metricsLinkEnd} usage is %{emphasisStart} unchanged %{emphasisEnd} at %{memoryFrom}MB"
msgstr ""
-msgid "mrWidget|Added to the merge train at position %{mergeTrainPosition}"
-msgstr ""
-
msgid "mrWidget|Added to the merge train by"
msgstr ""
@@ -20124,6 +20121,9 @@ msgstr ""
msgid "mrWidget|If the %{missingBranchName} branch exists in your local repository, you can merge this merge request manually using the command line"
msgstr ""
+msgid "mrWidget|In the merge train at position %{mergeTrainPosition}"
+msgstr ""
+
msgid "mrWidget|Loading deployment statistics"
msgstr ""