diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-06 21:07:54 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-06 21:07:54 +0000 |
commit | 99ddca0d88f1e4e49d61b1aa9d41b5785528d1dc (patch) | |
tree | 556577b458832ebbc43b299e5bf436adf8b1c606 /locale | |
parent | e1867c38fc5a4b931b4b2256d4909182e94f1051 (diff) | |
download | gitlab-ce-99ddca0d88f1e4e49d61b1aa9d41b5785528d1dc.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'locale')
-rw-r--r-- | locale/gitlab.pot | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot index fdffac6dbc1..6436a828df0 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -2041,6 +2041,9 @@ msgstr "" msgid "Are you sure you want to lose your issue information?" msgstr "" +msgid "Are you sure you want to merge immediately?" +msgstr "" + msgid "Are you sure you want to permanently delete this license?" msgstr "" @@ -11004,6 +11007,9 @@ msgstr "" msgid "Merges this merge request when the pipeline succeeds." msgstr "" +msgid "Merging immediately isn't recommended as it may negatively impact the existing merge train. Read the %{docsLinkStart}documentation%{docsLinkEnd} for more information." +msgstr "" + msgid "Messages" msgstr "" |