diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-24 18:06:05 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-24 18:06:05 +0000 |
| commit | 2ed368929ab5094fec5da8038f723463596a80cf (patch) | |
| tree | aec98d50349b0e9a490db0099253b801b2d1a9ea /locale | |
| parent | f1a5755898e865428c923587402fd965b601c4ea (diff) | |
| download | gitlab-ce-2ed368929ab5094fec5da8038f723463596a80cf.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/gitlab.pot | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot index cd135f8db5b..0112d267c7c 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -15527,6 +15527,9 @@ msgstr "" msgid "The merge conflicts for this merge request have already been resolved. Please return to the merge request." msgstr "" +msgid "The merge request can now be merged." +msgstr "" + msgid "The name %{entryName} is already taken in this directory." msgstr "" |